Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 25058)
+++ applications/editors/josm/i18n/po/is.po	(revision 25188)
@@ -9,5 +9,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-15 21:56+0100\n"
+"POT-Creation-Date: 2011-01-30 17:30+0100\n"
 "PO-Revision-Date: 2010-11-27 04:37+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-01-15 19:33+0000\n"
-"X-Generator: Launchpad (build 12200)\n"
+"X-Launchpad-Export-Date: 2011-01-30 11:16+0000\n"
+"X-Generator: Launchpad (build 12274)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:218
+#: ../core/src/org/openstreetmap/josm/Main.java:222
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609
@@ -30,18 +30,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/HelpAwareOptionPane.java:118
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:55
-#: build/specialmessages.java:50
+#: build/specialmessages.java:51
 msgid "Help"
 msgstr "Hjálp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:457
+#: ../core/src/org/openstreetmap/josm/Main.java:461
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:458
-#: ../core/src/org/openstreetmap/josm/Main.java:491
-#: ../core/src/org/openstreetmap/josm/Main.java:578
+#: ../core/src/org/openstreetmap/josm/Main.java:462
+#: ../core/src/org/openstreetmap/josm/Main.java:495
+#: ../core/src/org/openstreetmap/josm/Main.java:582
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -96,5 +95,4 @@
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:146
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -111,12 +109,116 @@
 msgstr "Aðvörun"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:490
+#: ../core/src/org/openstreetmap/josm/Main.java:494
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:577
+#: ../core/src/org/openstreetmap/josm/Main.java:581
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:732
+#, 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/Main.java:747
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:748
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:749
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:331
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:374
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:444
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:491
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:131
+#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:276
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:834
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:692
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1012
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1220
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:80
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:366
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:685
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:698
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1105
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1113
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1358
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:150
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:74
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:93
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:72
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigExporter.java:46
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
+msgid "Error"
+msgstr "Villa"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
@@ -133,6 +235,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:83
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
@@ -247,5 +349,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:166
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:202
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -255,5 +357,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:222
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:258
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -286,7 +388,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1355
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1356
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -306,7 +409,7 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:185
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:186
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:202
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:195
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:196
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:194
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:92
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:189
@@ -315,5 +418,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:741
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107
-#: build/specialmessages.java:33
+#: build/specialmessages.java:34
 msgid "Cancel"
 msgstr "Hætta við"
@@ -480,5 +583,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:107
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:625
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
@@ -486,5 +589,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:507
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:983
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1012
@@ -738,6 +841,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:408
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:657
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:736
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:508
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -1006,11 +1108,10 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:131
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/HelpAwareOptionPane.java:91
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:178
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:170
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:98
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:300
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687
-#: build/specialmessages.java:58
+#: build/specialmessages.java:59
 msgid "OK"
 msgstr "Í lagi"
@@ -1026,10 +1127,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:167
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:681
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:760
 msgid "Easting"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:169
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:681
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:760
 msgid "Northing"
 msgstr ""
@@ -1088,5 +1189,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:610
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:689
 msgid "Please abort if you are not sure"
 msgstr ""
@@ -1655,13 +1756,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:202
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:202
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:227
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1670,5 +1771,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:235
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1676,9 +1777,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:266
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:280
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1686,5 +1787,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:286
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1713,92 +1814,4 @@
 msgid "Could not rename file ''{0}''"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:331
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:374
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:444
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:491
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:276
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
-#: ../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:330
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:834
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:518
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:675
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:227
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:470
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:757
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:959
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:969
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:80
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:366
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
-#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:35
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:685
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:698
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1105
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1113
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1358
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:150
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:74
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:159
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:84
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:141
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:152
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:137
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:135
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:145
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:139
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:150
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:143
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:156
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:110
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:93
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
-#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:72
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigExporter.java:46
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-msgid "Error"
-msgstr "Villa"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54
@@ -1831,6 +1844,6 @@
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
-#: build/specialmessages.java:65
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1403
+#: build/specialmessages.java:66
 msgid "Save"
 msgstr "Vista"
@@ -1941,5 +1954,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:74
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1379
 msgid "Close"
 msgstr "Loka"
@@ -1964,5 +1977,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:238
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
 msgid "No, abort"
@@ -1994,5 +2007,5 @@
 #: ../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:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:91
 msgid "Yes"
@@ -2804,37 +2817,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
 msgid "<not>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
 msgid "<or>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
 msgid "<left parent>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<right parent>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<colon>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<equals>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<key>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<question mark>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:52
 msgid "<end-of-file>"
 msgstr ""
@@ -3041,5 +3054,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
-#: build/specialmessages.java:47
+#: build/specialmessages.java:48
 msgid "Filter"
 msgstr ""
@@ -3146,36 +3159,36 @@
 "hnút, veg og vensl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:638
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:664
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:696
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:698
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:706
 msgid "Version expected"
 msgstr ""
@@ -3751,15 +3764,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:106
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Gat ekki hlaðið upp stillingunum. Ástæðan er: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:130
 msgid "Could not load preferences from server."
 msgstr ""
@@ -3847,5 +3860,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:295
 #, java-format
 msgid ""
@@ -3853,5 +3866,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:701
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:703
 #, java-format
 msgid ""
@@ -4133,5 +4146,6 @@
 #, java-format
 msgid ""
-"Projection code mismatch in '{0}': toCode() returns ''{1}'', expected ''{2}''"
+"Projection code mismatch in ''{0}'': toCode() returns ''{1}'', expected "
+"''{2}''."
 msgstr ""
 
@@ -4139,6 +4153,6 @@
 #, java-format
 msgid ""
-"Bad implementation of '{0}' projection class: cannot set preferences to "
-"match code ''{1}''"
+"Bad implementation of ''{0}'' projection class: cannot set preferences to "
+"match code ''{1}''."
 msgstr ""
 
@@ -4251,5 +4265,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:102
-#: build/trans_presets.java:1543 build/trans_presets.java:3400
+#: build/trans_presets.java:2346 build/trans_presets.java:5347
 msgid "Other"
 msgstr "Annað"
@@ -4334,7 +4348,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:197
-#, fuzzy
 msgid "Duplicate nodes in two un-closed ways"
-msgstr "Skipta upp hnút sem er notaður af mörgum vegum."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:208
@@ -4410,54 +4423,54 @@
 
 #. item "Relations/Multipolygon"
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:48
-#: build/trans_presets.java:4033
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:50
+#: build/trans_presets.java:6171
 msgid "Multipolygon"
 msgstr "Marghyrningur"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:49
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
 msgid "This test checks if multipolygons are valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:117
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:119
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:132
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:134
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:148
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:156
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:165
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:186
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:202
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:181
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:208
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:186
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:213
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:208
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:235
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:211
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:238
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:222
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:249
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:225
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:252
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -4721,9 +4734,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:392
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:647
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:726
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:470
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:106
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:308
 msgid "Add"
 msgstr "Bæta við"
@@ -4745,6 +4758,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:483
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:679
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:719
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:938
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
@@ -4762,6 +4775,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:414
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:663
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:742
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
 msgid "Please select the row to delete."
@@ -5201,5 +5213,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6248
 msgid "railway"
 msgstr ""
@@ -5318,5 +5330,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/HelpAwareOptionPane.java:120
 msgid "Show help information"
 msgstr ""
@@ -5331,5 +5342,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:84
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/HelpAwareOptionPane.java:93
 msgid "Click to close the dialog"
 msgstr ""
@@ -5345,5 +5355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:92
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:112
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:94
 msgid "Blank Layer"
@@ -5365,38 +5375,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:41
 msgid "Upload Preferences"
 msgstr "Hlaða upp stillingum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload the current preferences to the server"
 msgstr "Hlaða JOSM stillingum þínum upp á OSM þjóninn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid "string"
 msgstr "strengur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "Name of the user."
 msgstr "Notandanafn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "OSM Password."
 msgstr "OSM lykilorð."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "string;string;..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -5404,5 +5414,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -5410,5 +5420,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -5416,87 +5426,87 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:63
 msgid "any"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:63
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:107
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Notandanafn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:110
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Lykilorð"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+msgid "usage"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+msgid "options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+msgid "Show this help"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+msgid "Download the bounding box"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
-msgid "usage"
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
-msgid "options"
+msgid "Download the bounding box as raw gps"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
-msgid "Show this help"
+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:88
-msgid "Standard unix geometry argument"
+msgid "Select with the given search"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
-msgid "Download the bounding box"
+msgid "Launch in maximized mode"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgid "Reset the preferences to default"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
-msgid "Open a file (any file type that can be opened with File/Open)"
+msgid "Set the language"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
-msgid "Download the bounding box as raw gps"
+msgid "options provided as Java system properties"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
+msgid "/PATH/TO/JOSM/FOLDER/         "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+msgid "Change the folder for all user settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
-msgid "Select with the given search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
-msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
-msgid "Reset the preferences to default"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
-msgid "Set the language"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
-msgid "options provided as Java system properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
-msgid "Change the folder for all user settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5506,9 +5516,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -5516,50 +5526,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:193
 msgid "Initializing"
 msgstr "Upphafsstilli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:210
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Creating main GUI"
 msgstr "Bý til aðal notandaviðmót"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:234
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
 msgid "Loading plugins"
 msgstr "Hleð inn viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:263
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:258
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:258
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:218
 msgid "Discard"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:267
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:261
 #, java-format
 msgid "JOSM found {0} unsaved osm data layer. "
@@ -5568,27 +5578,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:269
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:263
 msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:300
+#: ../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/MainApplication.java:313
-#, 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:328
-msgid "Exit JOSM"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
-msgid "Continue, try anyway"
 msgstr ""
 
@@ -5600,5 +5594,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
-#: build/specialmessages.java:76
+#: build/specialmessages.java:77
 msgid "View"
 msgstr "Sýn"
@@ -6134,5 +6128,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:697
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
-#: build/specialmessages.java:72
+#: build/specialmessages.java:73
 msgid "Up"
 msgstr ""
@@ -6154,7 +6148,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:194
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:460
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:698
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:917
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java:26
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:284
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:154
@@ -6458,5 +6454,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
-#: build/trans_presets.java:4017
+#: build/trans_presets.java:6153
 msgid "all"
 msgstr ""
@@ -6611,5 +6607,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:150
-#: build/specialmessages.java:85
+#: build/specialmessages.java:86
 msgid "Value:"
 msgstr ""
@@ -6714,5 +6710,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:185
-#: build/specialmessages.java:36
+#: build/specialmessages.java:37
 msgid "Details"
 msgstr ""
@@ -6744,5 +6740,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:112
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:108
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
@@ -6973,5 +6969,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:534
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:793
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
@@ -7061,5 +7057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:571
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:486
 msgid "Activate"
 msgstr ""
@@ -7109,5 +7105,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:769
-#: build/trans_presets.java:4032
+#: build/trans_presets.java:6170
 msgid "Relations"
 msgstr "Vensl"
@@ -7488,5 +7484,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
-#: build/specialmessages.java:59
+#: build/specialmessages.java:60
 msgid "Open"
 msgstr ""
@@ -8487,182 +8483,182 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:681
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:760
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
-#: build/specialmessages.java:57 build/trans_presets.java:96
-#: build/trans_presets.java:134 build/trans_presets.java:176
-#: build/trans_presets.java:216 build/trans_presets.java:237
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:294 build/trans_presets.java:313
-#: build/trans_presets.java:334 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:440
-#: build/trans_presets.java:460 build/trans_presets.java:475
-#: build/trans_presets.java:490 build/trans_presets.java:514
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:595 build/trans_presets.java:618
-#: build/trans_presets.java:638 build/trans_presets.java:658
-#: build/trans_presets.java:678 build/trans_presets.java:687
-#: build/trans_presets.java:698 build/trans_presets.java:760
-#: build/trans_presets.java:784 build/trans_presets.java:793
-#: build/trans_presets.java:854 build/trans_presets.java:1007
-#: build/trans_presets.java:1015 build/trans_presets.java:1023
-#: build/trans_presets.java:1031 build/trans_presets.java:1042
-#: build/trans_presets.java:1051 build/trans_presets.java:1057
-#: build/trans_presets.java:1065 build/trans_presets.java:1072
-#: build/trans_presets.java:1086 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1110 build/trans_presets.java:1116
-#: build/trans_presets.java:1123 build/trans_presets.java:1133
-#: build/trans_presets.java:1139 build/trans_presets.java:1145
-#: build/trans_presets.java:1150 build/trans_presets.java:1156
-#: build/trans_presets.java:1164 build/trans_presets.java:1173
-#: build/trans_presets.java:1180 build/trans_presets.java:1186
-#: build/trans_presets.java:1203 build/trans_presets.java:1210
-#: build/trans_presets.java:1217 build/trans_presets.java:1314
-#: build/trans_presets.java:1365 build/trans_presets.java:1371
-#: build/trans_presets.java:1377 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1401 build/trans_presets.java:1411
-#: build/trans_presets.java:1432 build/trans_presets.java:1464
-#: build/trans_presets.java:1474 build/trans_presets.java:1480
-#: build/trans_presets.java:1488 build/trans_presets.java:1504
-#: build/trans_presets.java:1513 build/trans_presets.java:1523
-#: build/trans_presets.java:1532 build/trans_presets.java:1556
-#: build/trans_presets.java:1564 build/trans_presets.java:1571
-#: build/trans_presets.java:1582 build/trans_presets.java:1592
-#: build/trans_presets.java:1602 build/trans_presets.java:1622
-#: build/trans_presets.java:1634 build/trans_presets.java:1645
-#: build/trans_presets.java:1665 build/trans_presets.java:1680
-#: build/trans_presets.java:1688 build/trans_presets.java:1745
-#: build/trans_presets.java:1762 build/trans_presets.java:1780
-#: build/trans_presets.java:1797 build/trans_presets.java:1814
-#: build/trans_presets.java:1831 build/trans_presets.java:1848
-#: build/trans_presets.java:1866 build/trans_presets.java:1888
-#: build/trans_presets.java:1907 build/trans_presets.java:1928
-#: build/trans_presets.java:1947 build/trans_presets.java:1964
-#: build/trans_presets.java:1983 build/trans_presets.java:2001
-#: build/trans_presets.java:2018 build/trans_presets.java:2035
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2066 build/trans_presets.java:2073
-#: build/trans_presets.java:2090 build/trans_presets.java:2098
-#: build/trans_presets.java:2114 build/trans_presets.java:2124
-#: build/trans_presets.java:2136 build/trans_presets.java:2146
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2166 build/trans_presets.java:2175
-#: build/trans_presets.java:2185 build/trans_presets.java:2190
-#: build/trans_presets.java:2198 build/trans_presets.java:2205
-#: build/trans_presets.java:2213 build/trans_presets.java:2222
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2250
-#: build/trans_presets.java:2260 build/trans_presets.java:2272
-#: build/trans_presets.java:2278 build/trans_presets.java:2285
-#: build/trans_presets.java:2293 build/trans_presets.java:2300
-#: build/trans_presets.java:2307 build/trans_presets.java:2315
-#: build/trans_presets.java:2322 build/trans_presets.java:2328
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2361 build/trans_presets.java:2371
-#: build/trans_presets.java:2377 build/trans_presets.java:2385
-#: build/trans_presets.java:2393 build/trans_presets.java:2401
-#: build/trans_presets.java:2428 build/trans_presets.java:2505
-#: build/trans_presets.java:2522 build/trans_presets.java:2537
-#: build/trans_presets.java:2546 build/trans_presets.java:2555
-#: build/trans_presets.java:2564 build/trans_presets.java:2573
-#: build/trans_presets.java:2579 build/trans_presets.java:2587
-#: build/trans_presets.java:2593 build/trans_presets.java:2599
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2681 build/trans_presets.java:2689
-#: build/trans_presets.java:2695 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2745 build/trans_presets.java:2754
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2779
-#: build/trans_presets.java:2785 build/trans_presets.java:2791
-#: build/trans_presets.java:2797 build/trans_presets.java:2803
-#: build/trans_presets.java:2809 build/trans_presets.java:2815
-#: build/trans_presets.java:2821 build/trans_presets.java:2829
-#: build/trans_presets.java:2835 build/trans_presets.java:2841
-#: build/trans_presets.java:2847 build/trans_presets.java:2854
-#: build/trans_presets.java:2860 build/trans_presets.java:2873
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2903 build/trans_presets.java:2908
-#: build/trans_presets.java:2923 build/trans_presets.java:2930
-#: build/trans_presets.java:2942 build/trans_presets.java:2952
-#: build/trans_presets.java:2959 build/trans_presets.java:2968
-#: build/trans_presets.java:2975 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2995
-#: build/trans_presets.java:3001 build/trans_presets.java:3015
-#: build/trans_presets.java:3025 build/trans_presets.java:3031
-#: build/trans_presets.java:3043 build/trans_presets.java:3050
-#: build/trans_presets.java:3106 build/trans_presets.java:3112
-#: build/trans_presets.java:3120 build/trans_presets.java:3127
-#: build/trans_presets.java:3133 build/trans_presets.java:3139
-#: build/trans_presets.java:3145 build/trans_presets.java:3150
-#: build/trans_presets.java:3155 build/trans_presets.java:3160
-#: build/trans_presets.java:3169 build/trans_presets.java:3176
-#: build/trans_presets.java:3183 build/trans_presets.java:3191
-#: build/trans_presets.java:3198 build/trans_presets.java:3206
-#: build/trans_presets.java:3215 build/trans_presets.java:3223
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3248 build/trans_presets.java:3256
-#: build/trans_presets.java:3262 build/trans_presets.java:3270
-#: build/trans_presets.java:3278 build/trans_presets.java:3285
-#: build/trans_presets.java:3292 build/trans_presets.java:3298
-#: build/trans_presets.java:3306 build/trans_presets.java:3313
-#: build/trans_presets.java:3319 build/trans_presets.java:3327
-#: build/trans_presets.java:3336 build/trans_presets.java:3342
-#: build/trans_presets.java:3350 build/trans_presets.java:3359
-#: build/trans_presets.java:3366 build/trans_presets.java:3372
-#: build/trans_presets.java:3381 build/trans_presets.java:3390
-#: build/trans_presets.java:3406 build/trans_presets.java:3415
-#: build/trans_presets.java:3423 build/trans_presets.java:3429
-#: build/trans_presets.java:3435 build/trans_presets.java:3443
-#: build/trans_presets.java:3452 build/trans_presets.java:3461
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3483 build/trans_presets.java:3491
-#: build/trans_presets.java:3499 build/trans_presets.java:3507
-#: build/trans_presets.java:3516 build/trans_presets.java:3525
-#: build/trans_presets.java:3533 build/trans_presets.java:3541
-#: build/trans_presets.java:3548 build/trans_presets.java:3555
-#: build/trans_presets.java:3563 build/trans_presets.java:3570
-#: build/trans_presets.java:3578 build/trans_presets.java:3605
-#: build/trans_presets.java:3611 build/trans_presets.java:3617
-#: build/trans_presets.java:3623 build/trans_presets.java:3629
-#: build/trans_presets.java:3637 build/trans_presets.java:3644
-#: build/trans_presets.java:3651 build/trans_presets.java:3658
-#: build/trans_presets.java:3665 build/trans_presets.java:3673
-#: build/trans_presets.java:3681 build/trans_presets.java:3689
-#: build/trans_presets.java:3696 build/trans_presets.java:3703
-#: build/trans_presets.java:3712 build/trans_presets.java:3721
-#: build/trans_presets.java:3729 build/trans_presets.java:3737
-#: build/trans_presets.java:3745 build/trans_presets.java:3754
-#: build/trans_presets.java:3762 build/trans_presets.java:3772
-#: build/trans_presets.java:3782 build/trans_presets.java:3791
-#: build/trans_presets.java:3797 build/trans_presets.java:3803
-#: build/trans_presets.java:3809 build/trans_presets.java:3814
-#: build/trans_presets.java:3820 build/trans_presets.java:3830
-#: build/trans_presets.java:3836 build/trans_presets.java:3842
-#: build/trans_presets.java:3848 build/trans_presets.java:3855
-#: build/trans_presets.java:3862 build/trans_presets.java:3868
-#: build/trans_presets.java:3874 build/trans_presets.java:3881
-#: build/trans_presets.java:3887 build/trans_presets.java:3892
-#: build/trans_presets.java:3899 build/trans_presets.java:3906
-#: build/trans_presets.java:3912 build/trans_presets.java:3921
-#: build/trans_presets.java:3929 build/trans_presets.java:3935
-#: build/trans_presets.java:3941 build/trans_presets.java:3948
-#: build/trans_presets.java:3956 build/trans_presets.java:3962
-#: build/trans_presets.java:3969 build/trans_presets.java:3975
-#: build/trans_presets.java:3981 build/trans_presets.java:3987
-#: build/trans_presets.java:3993 build/trans_presets.java:4040
-#: build/trans_presets.java:4054 build/trans_presets.java:4073
-#: build/trans_presets.java:4087 build/trans_presets.java:4110
+#: build/specialmessages.java:58 build/trans_presets.java:115
+#: build/trans_presets.java:157 build/trans_presets.java:203
+#: build/trans_presets.java:247 build/trans_presets.java:270
+#: build/trans_presets.java:290 build/trans_presets.java:310
+#: build/trans_presets.java:346 build/trans_presets.java:382
+#: build/trans_presets.java:424 build/trans_presets.java:492
+#: build/trans_presets.java:529 build/trans_presets.java:715
+#: build/trans_presets.java:742 build/trans_presets.java:758
+#: build/trans_presets.java:774 build/trans_presets.java:850
+#: build/trans_presets.java:951 build/trans_presets.java:989
+#: build/trans_presets.java:1034 build/trans_presets.java:1074
+#: build/trans_presets.java:1111 build/trans_presets.java:1148
+#: build/trans_presets.java:1185 build/trans_presets.java:1194
+#: build/trans_presets.java:1205 build/trans_presets.java:1305
+#: build/trans_presets.java:1329 build/trans_presets.java:1338
+#: build/trans_presets.java:1399 build/trans_presets.java:1556
+#: build/trans_presets.java:1565 build/trans_presets.java:1574
+#: build/trans_presets.java:1583 build/trans_presets.java:1595
+#: build/trans_presets.java:1605 build/trans_presets.java:1611
+#: build/trans_presets.java:1619 build/trans_presets.java:1626
+#: build/trans_presets.java:1640 build/trans_presets.java:1647
+#: build/trans_presets.java:1652 build/trans_presets.java:1659
+#: build/trans_presets.java:1664 build/trans_presets.java:1670
+#: build/trans_presets.java:1677 build/trans_presets.java:1687
+#: build/trans_presets.java:1701 build/trans_presets.java:1707
+#: build/trans_presets.java:1712 build/trans_presets.java:1718
+#: build/trans_presets.java:1726 build/trans_presets.java:1741
+#: build/trans_presets.java:1748 build/trans_presets.java:1754
+#: build/trans_presets.java:1771 build/trans_presets.java:1778
+#: build/trans_presets.java:1785 build/trans_presets.java:1972
+#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2087 build/trans_presets.java:2097
+#: build/trans_presets.java:2163 build/trans_presets.java:2204
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2236 build/trans_presets.java:2256
+#: build/trans_presets.java:2269 build/trans_presets.java:2283
+#: build/trans_presets.java:2299 build/trans_presets.java:2359
+#: build/trans_presets.java:2367 build/trans_presets.java:2374
+#: build/trans_presets.java:2385 build/trans_presets.java:2395
+#: build/trans_presets.java:2405 build/trans_presets.java:2425
+#: build/trans_presets.java:2437 build/trans_presets.java:2448
+#: build/trans_presets.java:2477 build/trans_presets.java:2492
+#: build/trans_presets.java:2500 build/trans_presets.java:2557
+#: build/trans_presets.java:2574 build/trans_presets.java:2611
+#: build/trans_presets.java:2647 build/trans_presets.java:2683
+#: build/trans_presets.java:2719 build/trans_presets.java:2755
+#: build/trans_presets.java:2791 build/trans_presets.java:2836
+#: build/trans_presets.java:2874 build/trans_presets.java:2936
+#: build/trans_presets.java:2997 build/trans_presets.java:3036
+#: build/trans_presets.java:3079 build/trans_presets.java:3119
+#: build/trans_presets.java:3158 build/trans_presets.java:3197
+#: build/trans_presets.java:3226 build/trans_presets.java:3233
+#: build/trans_presets.java:3241 build/trans_presets.java:3252
+#: build/trans_presets.java:3277 build/trans_presets.java:3291
+#: build/trans_presets.java:3306 build/trans_presets.java:3319
+#: build/trans_presets.java:3334 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3362
+#: build/trans_presets.java:3372 build/trans_presets.java:3381
+#: build/trans_presets.java:3399 build/trans_presets.java:3404
+#: build/trans_presets.java:3412 build/trans_presets.java:3426
+#: build/trans_presets.java:3434 build/trans_presets.java:3447
+#: build/trans_presets.java:3454 build/trans_presets.java:3465
+#: build/trans_presets.java:3471 build/trans_presets.java:3479
+#: build/trans_presets.java:3522 build/trans_presets.java:3537
+#: build/trans_presets.java:3543 build/trans_presets.java:3550
+#: build/trans_presets.java:3562 build/trans_presets.java:3569
+#: build/trans_presets.java:3576 build/trans_presets.java:3584
+#: build/trans_presets.java:3591 build/trans_presets.java:3597
+#: build/trans_presets.java:3605 build/trans_presets.java:3611
+#: build/trans_presets.java:3617 build/trans_presets.java:3623
+#: build/trans_presets.java:3630 build/trans_presets.java:3640
+#: build/trans_presets.java:3650 build/trans_presets.java:3665
+#: build/trans_presets.java:3677 build/trans_presets.java:3689
+#: build/trans_presets.java:3716 build/trans_presets.java:3835
+#: build/trans_presets.java:3868 build/trans_presets.java:3883
+#: build/trans_presets.java:3929 build/trans_presets.java:3975
+#: build/trans_presets.java:4021 build/trans_presets.java:4067
+#: build/trans_presets.java:4077 build/trans_presets.java:4089
+#: build/trans_presets.java:4100 build/trans_presets.java:4111
+#: build/trans_presets.java:4122 build/trans_presets.java:4133
+#: build/trans_presets.java:4144 build/trans_presets.java:4155
+#: build/trans_presets.java:4166 build/trans_presets.java:4177
+#: build/trans_presets.java:4188 build/trans_presets.java:4199
+#: build/trans_presets.java:4210 build/trans_presets.java:4221
+#: build/trans_presets.java:4232 build/trans_presets.java:4244
+#: build/trans_presets.java:4269 build/trans_presets.java:4282
+#: build/trans_presets.java:4293 build/trans_presets.java:4304
+#: build/trans_presets.java:4315 build/trans_presets.java:4326
+#: build/trans_presets.java:4337 build/trans_presets.java:4348
+#: build/trans_presets.java:4359 build/trans_presets.java:4370
+#: build/trans_presets.java:4383 build/trans_presets.java:4396
+#: build/trans_presets.java:4407 build/trans_presets.java:4419
+#: build/trans_presets.java:4430 build/trans_presets.java:4441
+#: build/trans_presets.java:4452 build/trans_presets.java:4463
+#: build/trans_presets.java:4474 build/trans_presets.java:4485
+#: build/trans_presets.java:4496 build/trans_presets.java:4507
+#: build/trans_presets.java:4518 build/trans_presets.java:4531
+#: build/trans_presets.java:4542 build/trans_presets.java:4552
+#: build/trans_presets.java:4562 build/trans_presets.java:4573
+#: build/trans_presets.java:4583 build/trans_presets.java:4600
+#: build/trans_presets.java:4618 build/trans_presets.java:4625
+#: build/trans_presets.java:4633 build/trans_presets.java:4638
+#: build/trans_presets.java:4663 build/trans_presets.java:4670
+#: build/trans_presets.java:4706 build/trans_presets.java:4734
+#: build/trans_presets.java:4741 build/trans_presets.java:4750
+#: build/trans_presets.java:4757 build/trans_presets.java:4764
+#: build/trans_presets.java:4770 build/trans_presets.java:4777
+#: build/trans_presets.java:4783 build/trans_presets.java:4799
+#: build/trans_presets.java:4823 build/trans_presets.java:4829
+#: build/trans_presets.java:4853 build/trans_presets.java:4860
+#: build/trans_presets.java:4925 build/trans_presets.java:4931
+#: build/trans_presets.java:4943 build/trans_presets.java:4954
+#: build/trans_presets.java:4960 build/trans_presets.java:4966
+#: build/trans_presets.java:4972 build/trans_presets.java:4977
+#: build/trans_presets.java:4982 build/trans_presets.java:4987
+#: build/trans_presets.java:4996 build/trans_presets.java:5007
+#: build/trans_presets.java:5018 build/trans_presets.java:5030
+#: build/trans_presets.java:5041 build/trans_presets.java:5053
+#: build/trans_presets.java:5066 build/trans_presets.java:5078
+#: build/trans_presets.java:5091 build/trans_presets.java:5104
+#: build/trans_presets.java:5115 build/trans_presets.java:5127
+#: build/trans_presets.java:5137 build/trans_presets.java:5149
+#: build/trans_presets.java:5161 build/trans_presets.java:5172
+#: build/trans_presets.java:5183 build/trans_presets.java:5193
+#: build/trans_presets.java:5205 build/trans_presets.java:5216
+#: build/trans_presets.java:5226 build/trans_presets.java:5238
+#: build/trans_presets.java:5251 build/trans_presets.java:5261
+#: build/trans_presets.java:5273 build/trans_presets.java:5286
+#: build/trans_presets.java:5297 build/trans_presets.java:5307
+#: build/trans_presets.java:5320 build/trans_presets.java:5333
+#: build/trans_presets.java:5353 build/trans_presets.java:5366
+#: build/trans_presets.java:5378 build/trans_presets.java:5388
+#: build/trans_presets.java:5398 build/trans_presets.java:5410
+#: build/trans_presets.java:5423 build/trans_presets.java:5436
+#: build/trans_presets.java:5447 build/trans_presets.java:5459
+#: build/trans_presets.java:5470 build/trans_presets.java:5482
+#: build/trans_presets.java:5494 build/trans_presets.java:5506
+#: build/trans_presets.java:5519 build/trans_presets.java:5532
+#: build/trans_presets.java:5544 build/trans_presets.java:5556
+#: build/trans_presets.java:5567 build/trans_presets.java:5578
+#: build/trans_presets.java:5590 build/trans_presets.java:5601
+#: build/trans_presets.java:5613 build/trans_presets.java:5664
+#: build/trans_presets.java:5670 build/trans_presets.java:5676
+#: build/trans_presets.java:5682 build/trans_presets.java:5688
+#: build/trans_presets.java:5696 build/trans_presets.java:5703
+#: build/trans_presets.java:5710 build/trans_presets.java:5717
+#: build/trans_presets.java:5724 build/trans_presets.java:5732
+#: build/trans_presets.java:5740 build/trans_presets.java:5748
+#: build/trans_presets.java:5755 build/trans_presets.java:5762
+#: build/trans_presets.java:5771 build/trans_presets.java:5780
+#: build/trans_presets.java:5788 build/trans_presets.java:5796
+#: build/trans_presets.java:5804 build/trans_presets.java:5813
+#: build/trans_presets.java:5821 build/trans_presets.java:5831
+#: build/trans_presets.java:5841 build/trans_presets.java:5854
+#: build/trans_presets.java:5864 build/trans_presets.java:5870
+#: build/trans_presets.java:5876 build/trans_presets.java:5881
+#: build/trans_presets.java:5887 build/trans_presets.java:5897
+#: build/trans_presets.java:5903 build/trans_presets.java:5909
+#: build/trans_presets.java:5915 build/trans_presets.java:5922
+#: build/trans_presets.java:5929 build/trans_presets.java:5935
+#: build/trans_presets.java:5941 build/trans_presets.java:5948
+#: build/trans_presets.java:5954 build/trans_presets.java:5959
+#: build/trans_presets.java:5966 build/trans_presets.java:5973
+#: build/trans_presets.java:5979 build/trans_presets.java:6017
+#: build/trans_presets.java:6054 build/trans_presets.java:6060
+#: build/trans_presets.java:6066 build/trans_presets.java:6073
+#: build/trans_presets.java:6081 build/trans_presets.java:6087
+#: build/trans_presets.java:6094 build/trans_presets.java:6100
+#: build/trans_presets.java:6106 build/trans_presets.java:6112
+#: build/trans_presets.java:6118 build/trans_presets.java:6178
+#: build/trans_presets.java:6192 build/trans_presets.java:6225
+#: build/trans_presets.java:6251 build/trans_presets.java:6279
 msgid "Name"
 msgstr "Heiti"
@@ -9085,5 +9081,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:147
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:152
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:155
@@ -9906,12 +9902,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
-#: build/specialmessages.java:71 build/trans_presets.java:438
-#: build/trans_presets.java:733 build/trans_presets.java:742
-#: build/trans_presets.java:1134 build/trans_presets.java:1413
-#: build/trans_presets.java:1525 build/trans_presets.java:2262
-#: build/trans_presets.java:2747 build/trans_presets.java:2756
-#: build/trans_presets.java:2916 build/trans_presets.java:3032
-#: build/trans_presets.java:3042 build/trans_presets.java:3773
-#: build/trans_presets.java:3783 build/trans_presets.java:3792
+#: build/specialmessages.java:72 build/trans_presets.java:698
+#: build/trans_presets.java:1256 build/trans_presets.java:1279
+#: build/trans_presets.java:1688 build/trans_presets.java:2099
+#: build/trans_presets.java:2285 build/trans_presets.java:3524
+#: build/trans_presets.java:4385 build/trans_presets.java:4398
+#: build/trans_presets.java:4646 build/trans_presets.java:4830
+#: build/trans_presets.java:4844 build/trans_presets.java:5832
+#: build/trans_presets.java:5842 build/trans_presets.java:5855
 msgid "Type"
 msgstr "Gerð"
@@ -9955,17 +9951,17 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:33
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:181
-#: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:413 build/trans_presets.java:414
-#: build/trans_presets.java:415 build/trans_presets.java:416
-#: build/trans_presets.java:417 build/trans_presets.java:418
-#: build/trans_presets.java:419 build/trans_presets.java:420
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:503 build/trans_presets.java:534
-#: build/trans_presets.java:579 build/trans_presets.java:711
-#: build/trans_presets.java:733 build/trans_presets.java:1345
-#: build/trans_presets.java:1418 build/trans_presets.java:1419
-#: build/trans_presets.java:1420 build/trans_presets.java:2178
-#: build/trans_presets.java:2512 build/trans_presets.java:2513
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:578 build/trans_presets.java:587
+#: build/trans_presets.java:597 build/trans_presets.java:607
+#: build/trans_presets.java:620 build/trans_presets.java:633
+#: build/trans_presets.java:642 build/trans_presets.java:655
+#: build/trans_presets.java:668 build/trans_presets.java:678
+#: build/trans_presets.java:811 build/trans_presets.java:824
+#: build/trans_presets.java:837 build/trans_presets.java:917
+#: build/trans_presets.java:1014 build/trans_presets.java:1224
+#: build/trans_presets.java:1262 build/trans_presets.java:2030
+#: build/trans_presets.java:2117 build/trans_presets.java:2122
+#: build/trans_presets.java:2127 build/trans_presets.java:3391
+#: build/trans_presets.java:3849 build/trans_presets.java:3854
+#: build/trans_presets.java:3859
 msgid "unknown"
 msgstr "óskilgreint"
@@ -10532,5 +10528,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:957
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1234
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -10560,5 +10557,5 @@
 #: ../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:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 msgid "No"
 msgstr ""
@@ -10771,21 +10768,21 @@
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:681
-#: build/trans_presets.java:97 build/trans_presets.java:115
-#: build/trans_presets.java:135 build/trans_presets.java:155
-#: build/trans_presets.java:177 build/trans_presets.java:195
-#: build/trans_presets.java:217 build/trans_presets.java:238
-#: build/trans_presets.java:264 build/trans_presets.java:283
-#: build/trans_presets.java:302 build/trans_presets.java:321
-#: build/trans_presets.java:342 build/trans_presets.java:376
-#: build/trans_presets.java:396 build/trans_presets.java:446
-#: build/trans_presets.java:461 build/trans_presets.java:476
-#: build/trans_presets.java:500 build/trans_presets.java:538
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:603 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:666
-#: build/trans_presets.java:1008 build/trans_presets.java:1016
-#: build/trans_presets.java:1024 build/trans_presets.java:1032
-#: build/trans_presets.java:1043 build/trans_presets.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:760
+#: build/trans_presets.java:116 build/trans_presets.java:136
+#: build/trans_presets.java:158 build/trans_presets.java:180
+#: build/trans_presets.java:204 build/trans_presets.java:224
+#: build/trans_presets.java:248 build/trans_presets.java:271
+#: build/trans_presets.java:298 build/trans_presets.java:318
+#: build/trans_presets.java:354 build/trans_presets.java:390
+#: build/trans_presets.java:432 build/trans_presets.java:499
+#: build/trans_presets.java:536 build/trans_presets.java:721
+#: build/trans_presets.java:743 build/trans_presets.java:759
+#: build/trans_presets.java:799 build/trans_presets.java:938
+#: build/trans_presets.java:975 build/trans_presets.java:1018
+#: build/trans_presets.java:1058 build/trans_presets.java:1099
+#: build/trans_presets.java:1135 build/trans_presets.java:1172
+#: build/trans_presets.java:1557 build/trans_presets.java:1566
+#: build/trans_presets.java:1575 build/trans_presets.java:1584
+#: build/trans_presets.java:1596 build/trans_presets.java:1978
 msgid "Layer"
 msgstr "Lag"
@@ -10826,5 +10823,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:255
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:260
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -11249,5 +11246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:437
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:571
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
@@ -11270,5 +11267,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
-#: build/trans_presets.java:4090
+#: build/trans_presets.java:6254
 msgid "Description"
 msgstr "Lýsing"
@@ -11549,5 +11546,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:204
 msgid "ERROR"
 msgstr ""
@@ -11729,12 +11726,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1235
-#, fuzzy, java-format
+#, java-format
 msgid "Pixel scale: {0}"
-msgstr "Skrá: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1236
-#, fuzzy, java-format
+#, java-format
 msgid "Best zoom: {0}"
-msgstr "Tól: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java:94
@@ -11742,24 +11739,24 @@
 msgstr "Engar villur fundust við athugun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:132
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:134
 msgid "(deactivated)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:186
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:187
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:189
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:229
 #, java-format
 msgid ""
@@ -11770,67 +11767,67 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:237
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:243
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:527
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:534
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:546
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:543
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:560
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:565
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:582
 msgid "Alpha channel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:596
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:613
 msgid "Save WMS layer to file"
 msgstr "Vista WMS lag í skrá"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:601
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:618
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:625
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:642
 msgid "Load WMS layer from file"
 msgstr "Hlaða WMS lag úr skrá"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:630
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:647
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:641
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:658
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:642
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:659
 msgid "File Format Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:691
 msgid "Error loading file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:705
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:716
 msgid "Automatic downloading"
 msgstr "Sjálfvirkt niðurhal"
@@ -12327,13 +12324,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
-msgid "Illegal dash pattern, values must be positive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
-msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:105
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:110
 #, java-format
 msgid ""
@@ -12341,5 +12330,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:108
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:114
 #, java-format
 msgid ""
@@ -12348,7 +12337,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:111
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:118
 #, java-format
 msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java:58
+msgid "Illegal dash pattern, values must be positive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java:64
+msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
 
@@ -12943,5 +12940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:82
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:479
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:558
 msgid "Menu Name"
 msgstr ""
@@ -13201,5 +13198,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:105
 #, java-format
 msgid "Choose a color for {0}"
@@ -13237,5 +13234,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173
 msgid "None"
@@ -13270,5 +13267,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1405
+#: build/trans_presets.java:2091
 msgid "Car"
 msgstr "Bíll"
@@ -13292,13 +13289,13 @@
 #. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:413 build/trans_presets.java:532
-#: build/trans_presets.java:810 build/trans_presets.java:829
-#: build/trans_presets.java:843 build/trans_presets.java:865
-#: build/trans_presets.java:902 build/trans_presets.java:915
-#: build/trans_presets.java:927 build/trans_presets.java:939
-#: build/trans_presets.java:951 build/trans_presets.java:963
-#: build/trans_presets.java:973 build/trans_presets.java:982
-#: build/trans_presets.java:991 build/trans_presets.java:1551
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:590 build/trans_presets.java:904
+#: build/trans_presets.java:1355 build/trans_presets.java:1374
+#: build/trans_presets.java:1388 build/trans_presets.java:1410
+#: build/trans_presets.java:1451 build/trans_presets.java:1464
+#: build/trans_presets.java:1476 build/trans_presets.java:1488
+#: build/trans_presets.java:1500 build/trans_presets.java:1512
+#: build/trans_presets.java:1522 build/trans_presets.java:1531
+#: build/trans_presets.java:1540 build/trans_presets.java:2354
+#: build/trans_presets.java:2427
 msgid "Bicycle"
 msgstr "Hjól"
@@ -13333,12 +13330,12 @@
 #. item "Barriers/Sally Port" check "Foot"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:414 build/trans_presets.java:531
-#: build/trans_presets.java:809 build/trans_presets.java:828
-#: build/trans_presets.java:842 build/trans_presets.java:864
-#: build/trans_presets.java:901 build/trans_presets.java:914
-#: build/trans_presets.java:926 build/trans_presets.java:938
-#: build/trans_presets.java:950 build/trans_presets.java:962
-#: build/trans_presets.java:972 build/trans_presets.java:981
-#: build/trans_presets.java:990
+#: build/trans_presets.java:600 build/trans_presets.java:898
+#: build/trans_presets.java:1354 build/trans_presets.java:1373
+#: build/trans_presets.java:1387 build/trans_presets.java:1409
+#: build/trans_presets.java:1450 build/trans_presets.java:1463
+#: build/trans_presets.java:1475 build/trans_presets.java:1487
+#: build/trans_presets.java:1499 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1530
+#: build/trans_presets.java:1539
 msgid "Foot"
 msgstr "Fótgangandi"
@@ -13551,144 +13548,171 @@
 msgstr "OSM gögn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:105
 msgid "imagery fade"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:116
 msgid "Fade Color: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:120
 msgid "Fade amount: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:126
 msgid "Soft"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:127
 msgid "Strong"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:128
 msgid "Sharpen (requires layer re-add): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:133
 msgid "WMSPlugin/SlippyMap settings migration"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:160
 msgid "Downloader:"
 msgstr "Niðurhalsforrit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167
 msgid "% of east:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:163
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:168
 msgid "% of north:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:183
 msgid "Simultaneous connections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:199
 msgid "Auto zoom by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:203
 msgid "Autoload tiles by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:202
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:207
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:211
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:215
 msgid "Add to slippymap chooser: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:219
 msgid "Tile cache directory: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241
 msgid "Common Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:237
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242
 msgid "WMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:243
 msgid "TMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:252
 msgid "Imagery Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:252
 msgid "Modify list of imagery layers displayed in the Imagery menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
 msgid "Imagery providers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:256
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261
 msgid "Offset bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:396
+msgid "Available default entries:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:422
+msgid "Selected entries:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:440
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:675
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:904
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
+msgid "New"
+msgstr "Ný"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:441
+msgid "add a new wms/tms entry by entering the url"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:449
 msgid "Add Imagery URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:424
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:433
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:461
+msgid "remove entry"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:487
+msgid "copy selected defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:506
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:479
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:543
+msgid "reload defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:558
 msgid "Imagery URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:479
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:558
 msgctxt "layer"
 msgid "Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:558
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:637
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:558
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:637
 msgid "Imagery URL (Default)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:601
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:680
 #, java-format
 msgid "EULA license URL not available: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:615
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:694
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:681
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:760
 msgid "Projection"
 msgstr ""
@@ -13803,20 +13827,77 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:42
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:44
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:74
 msgid "Map Paint Styles"
 msgstr "Teiknistíll korts"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:137
+msgid "Available styles:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:139
+msgid "Active styles:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:141
+msgid "Add a new style by entering filename or URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:143
+msgid "New style entry:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:145
+msgid "Remove the selected styles from the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:147
+msgid "Edit the filename or URL for the selected active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:149
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:151
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:153
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:155
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:162
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:210
+msgid "Internal Style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:211
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
@@ -14230,113 +14311,80 @@
 msgstr "Flýtileið"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:123
-msgid "Active styles:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:144
-#, java-format
-msgid "Available styles (from {0}):"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:274
 msgid "Icon paths:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:429
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:563
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:429
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:563
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:565
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:568
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:440
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:574
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:453
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:645
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
-msgid "New"
-msgstr "Ný"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:454
-msgid "Add a filename or an URL of an active style"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:469
-msgid "Remove the selected styles from the list of active styles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490
-msgid "Edit the filename or URL for the selected active style"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512
-msgid "Add the selected available styles to the list of active styles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:535
-#, java-format
-msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:646
+#. content.add(scroller);
+#. JOptionPane.showMessageDialog(Main.parent,scroller, tr("Clearsigned Signature"), JOptionPane.PLAIN_MESSAGE);
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:596
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:129
+msgid "Ok"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:601
+msgid "Name (optional):"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:605
+msgid "URL / File:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:741
+msgid "Edit source entry:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:780
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:373
+msgid "Reset"
+msgstr "Endurstilla"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:781
+msgid "Reset to default"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:905
 msgid "Add a new icon path"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:659
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:918
 msgid "Remove the selected icon paths"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:939
 msgid "Edit the selected icon path"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725
-#, java-format
-msgid "Loading style sources from ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:747
-#, java-format
-msgid ""
-"<html>Failed to load the list of style sources from<br>''{0}''."
-"<br><br>Details (untranslated):<br>{1}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:769
-msgid "Internal style"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:770
-msgid "Internal style to be used as base for runtime switchable overlay styles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:791
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:823
-#, java-format
-msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
 #, java-format
 msgid "Warning: Could not read tagging preset source: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
 #, java-format
 msgid ""
@@ -14346,10 +14394,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:87
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -14359,5 +14407,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
 #, java-format
 msgid ""
@@ -14366,5 +14414,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -14373,5 +14421,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:107
 #, java-format
 msgid ""
@@ -14380,11 +14428,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:146
 msgid "Tagging Presets"
 msgstr "Forstillingar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:210
+msgid "Available presets:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:212
+msgid "Active presets:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:214
+msgid "Add a new preset by entering filename or URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:216
+msgid "New preset entry:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:218
+msgid "Remove the selected presets from the list of active presets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:220
+msgid "Edit the filename or URL for the selected active preset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:222
+msgid "Add the selected available presets to the list of active presets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:224
+#, java-format
+msgid "Reloads the list of available presets from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:226
+#, java-format
+msgid "Loading preset sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:228
+#, java-format
+msgid ""
+"<html>Failed to load the list of preset sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:235
+#, java-format
+msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:302
+msgid "Internal Preset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:303
+msgid "The default preset for JOSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
@@ -14775,5 +14881,6 @@
 msgstr "Bæta við nýju taggi"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:396
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:446
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid ""
@@ -14782,5 +14889,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:401
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:717
 #, java-format
 msgid ""
@@ -14789,49 +14897,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:889
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Frekari upplýsingar um þessa forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:676
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:984
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:735
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:986
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:751
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1001
 msgid "Optional Attributes:"
 msgstr "Valfrjáls eigind:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:849
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1099
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:917
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1168
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1176
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:958
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1209
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -14841,15 +14949,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:968
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1219
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1260
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1090
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1341
 #: ../plugins/terracer/src/terracer/TerracerAction.java:213
 #, java-format
@@ -14859,22 +14967,22 @@
 msgstr[1] "Breyta {0} hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1093
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1344
 msgid "Nothing selected!"
 msgstr "Ekkert er valið!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1095
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1346
 msgid "Selection unsuitable!"
 msgstr "Val óhæfilegt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1355
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1356
 msgid "Apply Preset"
 msgstr "Vista forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1355
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1193
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1444
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15691,57 +15799,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:199
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:201
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:195
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:204
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:153
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:188
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:210
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:212
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:214
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:216
 #, java-format
 msgid "Deleted way {0} contains nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:234
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:237
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:240
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:232
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:248
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:193
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:249
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:252
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:199
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:254
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:257
 #, java-format
 msgid ""
@@ -15749,38 +15857,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:260
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:263
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:264
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:267
 #, java-format
 msgid "Deleted relation {0} contains members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:221
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:277
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:305
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308
 msgid "Illegal object with ID=0."
 msgstr "Ógildur hlutur með kenni=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:333
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:331
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:335
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:338
 #, java-format
 msgid ""
@@ -15790,12 +15898,12 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:337
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:343
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:348
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:362
 #, java-format
 msgid ""
@@ -15805,12 +15913,12 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:356
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
@@ -15818,10 +15926,10 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:386
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:396
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:388
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:398
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:391
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:401
 #, java-format
 msgid ""
@@ -15831,30 +15939,30 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:390
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:392
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:402
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:395
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:405
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:411
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:414
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:416
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:437
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:435
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440
 #, java-format
 msgid ""
@@ -15862,12 +15970,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:449
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452
 #, java-format
 msgid "Deleted node {0} is part of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460
 #, java-format
 msgid ""
@@ -15876,6 +15984,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:513
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:511
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516
 #, java-format
 msgid ""
@@ -15884,23 +15992,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:535
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540
 #, java-format
 msgid "Deleted member {0} is used by relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
 msgid "Prepare OSM data..."
 msgstr "Undirbý OSM gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568
 msgid "Preparing data set..."
 msgstr "Undirbý gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:584
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:66
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:233
@@ -16546,13 +16654,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74
 msgid "Do nothing"
 msgstr "Gera ekkert"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74
 msgid "Report Bug"
 msgstr "Senda villutilkynningu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -16561,9 +16669,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
 msgid "Unexpected Exception"
 msgstr "Óvænt villa"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:115
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -16571,5 +16679,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -16577,5 +16685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -16584,5 +16692,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -16590,9 +16698,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:134
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "Textinn hefur verið þegar verið afritaður"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:149
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -16951,25 +17059,21 @@
 msgstr ""
 
-#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:200
-#, fuzzy
+#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:187
 msgid "Commands"
-msgstr "Skipanasaga"
-
-#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:283
-#, fuzzy
+msgstr ""
+
+#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:271
 msgid "Command"
-msgstr "Skipanasaga"
-
-#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:371
-#, fuzzy
+msgstr ""
+
+#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:359
 msgid "Processing..."
-msgstr "Undirbý..."
-
-#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:387
-#, fuzzy
+msgstr ""
+
+#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:375
 msgid "Aborted"
-msgstr "Um JOSM..."
-
-#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:476
+msgstr ""
+
+#: ../plugins/CommandLine/src/CommandLine/CommandLine.java:464
 msgid "Error executing the script: "
 msgstr ""
@@ -16977,7 +17081,6 @@
 #: ../plugins/CommandLine/src/CommandLine/CommandLineAction.java:42
 #: ../plugins/CommandLine/src/CommandLine/CommandLineAction.java:43
-#, fuzzy
 msgid "Command line"
-msgstr "Strandlengja"
+msgstr ""
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLineAction.java:42
@@ -17014,17 +17117,14 @@
 
 #: ../plugins/CommandLine/src/CommandLine/Parameter.java:55
-#, fuzzy
 msgid "ways"
-msgstr "vegur"
+msgstr ""
 
 #: ../plugins/CommandLine/src/CommandLine/Parameter.java:58
-#, fuzzy
 msgid "relations"
-msgstr "vensl"
+msgstr ""
 
 #: ../plugins/CommandLine/src/CommandLine/Parameter.java:61
-#, fuzzy
 msgid "OSM objects"
-msgstr "Fjöldi hluta"
+msgstr ""
 
 #: ../plugins/CommandLine/src/CommandLine/PointAction.java:94
@@ -17122,5 +17222,5 @@
 #. item "Ways/Path" combo "Visibility"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:125
-#: build/trans_presets.java:524
+#: build/trans_presets.java:884
 msgid "Visibility"
 msgstr ""
@@ -17339,5 +17439,5 @@
 #. group "Highways/Streets"
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:71
-#: build/trans_presets.java:87
+#: build/trans_presets.java:106
 msgid "Streets"
 msgstr "Stræti"
@@ -17385,5 +17485,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
-#: build/trans_presets.java:3998
+#: build/trans_presets.java:6123
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -17403,5 +17503,5 @@
 #. item "Places/Country"
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
-#: build/trans_presets.java:3640
+#: build/trans_presets.java:5699
 msgid "Country"
 msgstr "Land"
@@ -17411,5 +17511,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: build/trans_presets.java:3669
+#: build/trans_presets.java:5728
 msgid "City"
 msgstr "Borg"
@@ -17422,5 +17522,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:448
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:170
 msgid "Street"
@@ -17430,5 +17530,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: build/trans_presets.java:679
+#: build/trans_presets.java:1186
 msgid "Number"
 msgstr "Tilvísun"
@@ -17584,5 +17684,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1203
-#: build/trans_presets.java:4012
+#: build/trans_presets.java:6145
 msgid "Address Interpolation"
 msgstr ""
@@ -18025,9 +18125,9 @@
 msgstr "Byggingar"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:447
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:489
 msgid "Enter addresses"
 msgstr ""
@@ -18223,5 +18323,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:2916 build/trans_style.java:812
+#: build/trans_presets.java:4647 build/trans_style.java:812
 #: build/trans_style.java:825 build/trans_style.java:837
 #: build/trans_style.java:842 build/trans_style.java:2900
@@ -18823,7 +18923,6 @@
 #. icon name
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:42
-#, fuzzy
 msgid "Merge the contour of an area with the contour of another area"
-msgstr "Sameina það lag sem nú er valið öðru lagi"
+msgstr ""
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:153
@@ -18836,7 +18935,6 @@
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:163
-#, fuzzy
 msgid "Can''t select an isolated node"
-msgstr "Vinsamlegast veldu a.m.k. þrjá hnúta"
+msgstr ""
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:166
@@ -18851,7 +18949,6 @@
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:229
-#, fuzzy
 msgid "Drop to align to the the target segment"
-msgstr "Tengir endahnút á vegi við nálægan veg"
+msgstr ""
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:258
@@ -18860,7 +18957,6 @@
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415
-#, fuzzy
 msgid "Merging Contour"
-msgstr "Breytingarárekstrar."
+msgstr ""
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:40
@@ -18954,11 +19050,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:242
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:287
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:277
 msgid "Drop existing path"
 msgstr ""
@@ -18968,5 +19064,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:313
 msgid "No GPX data layer found."
 msgstr ""
@@ -19000,13 +19096,13 @@
 msgstr ""
 
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:58
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:59
 msgid "dx"
 msgstr ""
 
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:62
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:63
 msgid "dy"
 msgstr ""
 
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:141
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:142
 msgid " - Bessel 1841 in Lambert Conformal Conic"
 msgstr ""
@@ -19032,5 +19128,5 @@
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:282
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:32
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:223
 msgid "Name:"
@@ -19128,5 +19224,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136
-#: build/specialmessages.java:62
+#: build/specialmessages.java:63
 msgid "Refresh"
 msgstr "Uppfæra"
@@ -19671,30 +19767,14 @@
 msgstr ""
 
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:112
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:108
 msgid "Open MapDust"
 msgstr ""
 
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:107
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:109
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:108
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:111
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:111
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:114
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:115
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:114
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:118
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:115
 msgid "Missing input data"
-msgstr ""
-
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustPanel.java:137
-msgid "Add comment"
-msgstr ""
-
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustPanel.java:143
-msgid "Close bug"
-msgstr ""
-
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustPanel.java:149
-msgid "Invalidate bug"
-msgstr ""
-
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustPanel.java:155
-msgid "Re-open bug"
 msgstr ""
 
@@ -19708,9 +19788,4 @@
 msgstr "Opna mæligluggann."
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:373
-msgid "Reset"
-msgstr "Endurstilla"
-
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:73
 msgid "Reset current measurement results and delete measurement path."
@@ -20532,5 +20607,5 @@
 #. group "Public Transport"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:2377
 msgid "Public Transport"
 msgstr "Almenningssamgöngur"
@@ -20577,5 +20652,5 @@
 #. group "Waypoints"
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:672
+#: build/trans_presets.java:1179
 msgid "Waypoints"
 msgstr "Vegpunktar"
@@ -20809,24 +20884,22 @@
 msgstr "Nýtt gildi fyrir {0}"
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptAction.java:15
-#, fuzzy
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptAction.java:18
 msgid "Run..."
-msgstr "Opna..."
+msgstr ""
 
 #. title
 #. icon name
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptAction.java:17
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:150
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptAction.java:20
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:153
 msgid "Run a script"
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:84
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:80
 msgid "Select a script file and click on <strong>Run</strong>."
 msgstr ""
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:108
-#, fuzzy
 msgid "File:"
-msgstr "Skrá"
+msgstr ""
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:112
@@ -20834,136 +20907,215 @@
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:198
-#, fuzzy
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:208
 msgid "Run"
-msgstr "Rústir"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:199
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:209
 msgid "Run the script"
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:206
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:216
 #, java-format
 msgid "The script file ''{0}'' doesn''t exist."
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:207
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:217
 msgid "File not found"
 msgstr "Skrá fannst ekki"
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:216
-#, fuzzy
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:226
 msgid "Please enter a file name first."
-msgstr "Sláðu inn hnitin fyrst"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:217
-#, fuzzy
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:227
 msgid "Empty file name"
-msgstr "Velja skráarnafn"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:226
-#, java-format
-msgid "The script file ''{0}'' isn't readable."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:227
-#, fuzzy
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:236
+#, java-format
+msgid "The script file ''{0}'' isn''t readable."
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:237
 msgid "File not readable"
-msgstr "Skrá fannst ekki"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:236
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:246
 #, java-format
 msgid "Failed to read the script from the file ''{0}''."
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:237
-#, fuzzy
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:247
 msgid "IO error"
-msgstr "Rekstraraðili"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:241
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:251
 #, java-format
 msgid "Failed to read a macro from the file ''{0}''."
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:248
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:258
 msgid "Script execution has failed."
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:249
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:259
 msgid "Script Error"
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:253
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:263
 msgid "Macro execution has failed."
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:262
-msgid ""
-"<p>The script can''t be executed, becasue there are currently no scripting "
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:272
+msgid ""
+"<p>The script can''t be executed, because there are currently no scripting "
 "engines installed.</p><p>Refer to the online help for information about how "
 "to install a scripting engine with JOSM.</p>"
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:267
-msgid "No scripting engine"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:349
-#, fuzzy
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:277
+msgid "No script engine"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:346
 msgid "..."
-msgstr "Opna..."
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:350
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:347
 msgid "Launch file selection dialog"
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:361
-#, fuzzy
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:358
 msgid "Select a script"
-msgstr "veldu íþrótt:"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:102
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:56
+msgid "Warning: failed to load mime types from file ''0''."
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:65
+msgid "Warning: failed to load default mime types from  resource ''0''."
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:94
 msgid "Please select a scripting engine to execute the selected script."
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:179
-#, fuzzy
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:171
 msgid "Accept the selected scripting engine"
-msgstr "Eyða völdum venslum"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:203
-#, fuzzy
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:195
 msgid "cancel"
-msgstr "Hætta við"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:276
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptingPlugin.java:34
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:35
+msgid "Scripting"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:21
+msgid "Configure..."
+msgstr ""
+
+#. title
+#. icon name
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:23
+msgid "Configure scripting preferences"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:28
+msgid "Script engines"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:34
+msgid "Configure script engines and scripts"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:32
+#, java-format
+msgid "''{0}'' doesn''t exist."
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:37
+#, java-format
+msgid "''{0}'' is a directory. Expecting a jar file instead."
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:41
+#, java-format
+msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:48
+#, java-format
+msgid ""
+"Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
+"this file"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:53
+#, java-format
+msgid ""
+"The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' is "
+"missing."
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:80
+msgid "JAR files"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:89
+msgid "Enter additional JAR files which provide script engines."
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:135
+msgid "Available script engines"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:143
+msgid "JOSM currently supports the following script engines:"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:203
+msgid "JAR file"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:285
+msgid "Remove the selected jar files"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:309
+msgid "Add a jar file providing a script engine"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:393
+msgid "Launch file chooser"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:404
+msgid "Select a jar file"
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:26
 #, java-format
 msgid "{1} (with engine {0})"
 msgstr ""
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:283
-#, fuzzy
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:33
 msgid "Version:"
-msgstr "Útgáfa"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:284
-#, fuzzy
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:34
 msgid "Language:"
-msgstr "Tungumál"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:285
-#, fuzzy
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:35
 msgid "Language version:"
-msgstr "Tungumál"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:286
+msgstr ""
+
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:36
 msgid "MIME-Types:"
 msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptingPlugin.java:28
-#, fuzzy
-msgid "Scripts"
-msgstr "Íþróttir"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:45
@@ -21416,10 +21568,4 @@
 #, java-format
 msgid "{0} Signatures found."
-msgstr ""
-
-#. content.add(scroller);
-#. JOptionPane.showMessageDialog(Main.parent,scroller, tr("Clearsigned Signature"), JOptionPane.PLAIN_MESSAGE);
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:129
-msgid "Ok"
 msgstr ""
 
@@ -22761,21 +22907,26 @@
 msgstr ""
 
-#. Java message loading audio data
+#. JOSM server message
 #: build/specialmessages.java:11
-msgid "could not get audio input stream from input URL"
+msgid "JOSM-Trac login at josm.openstreetmap.de"
 msgstr ""
 
 #. Java message loading audio data
 #: build/specialmessages.java:12
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:13
 msgid "Audio Device Unavailable"
 msgstr ""
 
 #. OSM server message
-#: build/specialmessages.java:13
+#: build/specialmessages.java:14
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
 #. Nominatim search place type
-#: build/specialmessages.java:14
+#: build/specialmessages.java:15
 msgid "town"
 msgstr ""
@@ -22788,17 +22939,11 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:2688
+#: build/specialmessages.java:16 build/trans_style.java:2688
 msgid "forest"
 msgstr "skógur (ræktaður)"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:16
+#: build/specialmessages.java:17
 msgid "farmland"
-msgstr ""
-
-#. relation type
-#: build/specialmessages.java:17
-msgctxt "Relation type"
-msgid "associatedStreet"
 msgstr ""
 
@@ -22806,5 +22951,5 @@
 #: build/specialmessages.java:18
 msgctxt "Relation type"
-msgid "boundary"
+msgid "associatedStreet"
 msgstr ""
 
@@ -22812,5 +22957,5 @@
 #: build/specialmessages.java:19
 msgctxt "Relation type"
-msgid "enforcement"
+msgid "boundary"
 msgstr ""
 
@@ -22818,5 +22963,5 @@
 #: build/specialmessages.java:20
 msgctxt "Relation type"
-msgid "line"
+msgid "enforcement"
 msgstr ""
 
@@ -22824,5 +22969,5 @@
 #: build/specialmessages.java:21
 msgctxt "Relation type"
-msgid "multipolygon"
+msgid "line"
 msgstr ""
 
@@ -22830,5 +22975,5 @@
 #: build/specialmessages.java:22
 msgctxt "Relation type"
-msgid "network"
+msgid "multipolygon"
 msgstr ""
 
@@ -22836,5 +22981,5 @@
 #: build/specialmessages.java:23
 msgctxt "Relation type"
-msgid "public_transport"
+msgid "network"
 msgstr ""
 
@@ -22842,5 +22987,5 @@
 #: build/specialmessages.java:24
 msgctxt "Relation type"
-msgid "restriction"
+msgid "public_transport"
 msgstr ""
 
@@ -22848,5 +22993,5 @@
 #: build/specialmessages.java:25
 msgctxt "Relation type"
-msgid "route"
+msgid "restriction"
 msgstr ""
 
@@ -22854,5 +22999,5 @@
 #: build/specialmessages.java:26
 msgctxt "Relation type"
-msgid "site"
+msgid "route"
 msgstr ""
 
@@ -22860,221 +23005,227 @@
 #: build/specialmessages.java:27
 msgctxt "Relation type"
+msgid "site"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:28
+msgctxt "Relation type"
 msgid "waterway"
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:29
-msgid "All Files"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:30
-msgid "Attributes"
+msgid "All Files"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:31
-msgid "Abort file chooser dialog"
+msgid "Attributes"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:32
+msgid "Abort file chooser dialog"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:33
 msgid "Abort file chooser dialog."
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:34
-msgid "Create New Folder"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:35
+msgid "Create New Folder"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:36
 msgid "Delete File"
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:37
-msgid "Enter file name:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:38
-msgid "Enter path or folder name:"
+msgid "Enter file name:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:39
-msgid "Error "
+msgid "Enter path or folder name:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:40
-#, java-format
-msgid "Error renaming file \"{0}\" to \"{1}\""
+msgid "Error "
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:41
-msgid "File name:"
+#, java-format
+msgid "Error renaming file \"{0}\" to \"{1}\""
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:42
-msgid "File Name:"
+msgid "File name:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:43
-msgid "FileChooser help."
+msgid "File Name:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:44
-msgid "Files"
+msgid "FileChooser help."
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:45
-msgid "Files of type:"
+msgid "Files"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:46
+msgid "Files of type:"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:47
 msgid "Files of Type:"
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:48
-msgid "Filter:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:49
+msgid "Filter:"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:50
 msgid "Folders"
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:51
-msgid "Home"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:52
-msgid "List"
+msgid "Home"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:53
-msgid "Look in:"
+msgid "List"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:54
-msgid "Look In:"
+msgid "Look in:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:55
-msgid "Modified"
+msgid "Look In:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:56
+msgid "Modified"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:57
 msgid "New Folder"
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:60
-msgid "Open selected file"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:61
+msgid "Open selected file"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:62
 msgid "Open selected file."
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:63
-msgid "Rename File"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:64
+msgid "Rename File"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:65
 #, java-format
 msgid "Rename file \"{0}\" to"
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:66
-msgid "Save in:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:67
-msgid "Save In:"
+msgid "Save in:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:68
-msgid "Save selected file."
+msgid "Save In:"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:69
-msgid "Selection:"
+msgid "Save selected file."
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:70
+msgid "Selection:"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:71
 msgid "Size"
-msgstr ""
-
-#. Strings in JFileChooser
-#: build/specialmessages.java:73
-msgid "Up One Level"
 msgstr ""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:74
+msgid "Up One Level"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:75
 msgid "Update"
 msgstr "Uppfæra"
 
 #. Strings in JFileChooser
-#: build/specialmessages.java:75
+#: build/specialmessages.java:76
 msgid "Update directory listing."
-msgstr ""
-
-#. Strings in GTK ColorChooser
-#: build/specialmessages.java:78
-msgid "Blue:"
 msgstr ""
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:79
-msgid "Color Name:"
+msgid "Blue:"
 msgstr ""
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:80
-msgid "Green:"
+msgid "Color Name:"
 msgstr ""
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:81
-msgid "Hue:"
+msgid "Green:"
 msgstr ""
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:82
-msgid "GTK Color Chooser"
+msgid "Hue:"
 msgstr ""
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:83
-msgid "Red:"
+msgid "GTK Color Chooser"
 msgstr ""
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:84
+msgid "Red:"
+msgstr ""
+
+#. Strings in GTK ColorChooser
+#: build/specialmessages.java:85
 msgid "Saturation:"
 msgstr ""
@@ -23371,5 +23522,5 @@
 msgstr ""
 
-#. Plugin SeaMapEditor
+#. Plugin smed
 #. Plugin smed_fw
 #: build/trans_plugins.java:107 build/trans_plugins.java:109
@@ -23400,5 +23551,5 @@
 msgstr ""
 
-#. Plugin toms
+#. Plugin SeaMapEditor
 #: build/trans_plugins.java:119
 msgid "Create and edit seamarks for OpenSeaMap"
@@ -23478,6 +23629,6 @@
 msgstr ""
 
-#. unparsed line <?xml version="1.0" encoding="UTF-8"?>
-#. unparsed line <presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
+#. <?xml version="1.0" encoding="UTF-8"?>
+#. <presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
 #. <!--
 #. Pics have been derived from
@@ -23523,4 +23674,22 @@
 #. delete_if_empty: true/false
 #. use_last_as_default: true/false
+#. multiselect: list of values from which zero or more can be selected
+#. key: key to set
+#. text: fixed label to display
+#. delimiter: character that separates values (default: semicolon) - this
+#. will also be used to separate selected values in the tag.
+#. values: delimiter-separated list of values (delimiter can be escaped with backslash)
+#. display_values: delimiter-separated list of values to be displayed instead of the
+#. database values, order and number must be equal to values
+#. short_description: delimiter-separated list of texts to be displayed below each
+#. display_value. (Only if it is not possible to describe
+#. the entry in 2-3 words.) Instead of a separated list, you can
+#. also write it in the following form:
+#. <short_description>first description</short_description>
+#. ...
+#. <short_description>last description</short_description>
+#. default: default string to display
+#. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -23553,5 +23722,5 @@
 #. -->
 #. group "Highways"
-#: build/trans_presets.java:86
+#: build/trans_presets.java:105
 msgid "Highways"
 msgstr "Vegir"
@@ -23562,5 +23731,5 @@
 #. </button>
 #. <button label="Motorway" hotkey="1">
-#: build/trans_presets.java:88 build/trans_surveyor.java:72
+#: build/trans_presets.java:107 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Hraðbraut"
@@ -23569,5 +23738,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
 #. item "Highways/Streets/Motorway" label "Edit Motorway"
-#: build/trans_presets.java:91
+#: build/trans_presets.java:110
 msgid "Edit Motorway"
 msgstr "Breyti hraðbraut"
@@ -23605,11 +23774,11 @@
 #. item "Power/Cable Distribution Cabinet" text "Reference"
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:94 build/trans_presets.java:132
-#: build/trans_presets.java:153 build/trans_presets.java:174
-#: build/trans_presets.java:214 build/trans_presets.java:235
-#: build/trans_presets.java:1701 build/trans_presets.java:1709
-#: build/trans_presets.java:1717 build/trans_presets.java:1751
-#: build/trans_presets.java:3052 build/trans_presets.java:3068
-#: build/trans_presets.java:4088
+#: build/trans_presets.java:113 build/trans_presets.java:155
+#: build/trans_presets.java:178 build/trans_presets.java:201
+#: build/trans_presets.java:245 build/trans_presets.java:268
+#: build/trans_presets.java:2513 build/trans_presets.java:2521
+#: build/trans_presets.java:2529 build/trans_presets.java:2563
+#: build/trans_presets.java:4862 build/trans_presets.java:4878
+#: build/trans_presets.java:6252
 msgid "Reference"
 msgstr "Tilvísun"
@@ -23623,8 +23792,8 @@
 #. item "Highways/Streets/Secondary" combo "Lanes"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
-#: build/trans_presets.java:98 build/trans_presets.java:116
-#: build/trans_presets.java:136 build/trans_presets.java:156
-#: build/trans_presets.java:178 build/trans_presets.java:196
-#: build/trans_presets.java:218 build/trans_presets.java:447
+#: build/trans_presets.java:118 build/trans_presets.java:138
+#: build/trans_presets.java:160 build/trans_presets.java:182
+#: build/trans_presets.java:206 build/trans_presets.java:226
+#: build/trans_presets.java:250 build/trans_presets.java:723
 msgid "Lanes"
 msgstr "Akreinar"
@@ -23648,13 +23817,13 @@
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
-#: build/trans_presets.java:99 build/trans_presets.java:117
-#: build/trans_presets.java:137 build/trans_presets.java:157
-#: build/trans_presets.java:179 build/trans_presets.java:197
-#: build/trans_presets.java:219 build/trans_presets.java:239
-#: build/trans_presets.java:265 build/trans_presets.java:344
-#: build/trans_presets.java:378 build/trans_presets.java:399
-#: build/trans_presets.java:421 build/trans_presets.java:462
-#: build/trans_presets.java:477 build/trans_presets.java:539
-#: build/trans_presets.java:559 build/trans_presets.java:1322
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:162 build/trans_presets.java:184
+#: build/trans_presets.java:208 build/trans_presets.java:228
+#: build/trans_presets.java:252 build/trans_presets.java:273
+#: build/trans_presets.java:300 build/trans_presets.java:451
+#: build/trans_presets.java:518 build/trans_presets.java:558
+#: build/trans_presets.java:681 build/trans_presets.java:745
+#: build/trans_presets.java:761 build/trans_presets.java:940
+#: build/trans_presets.java:977 build/trans_presets.java:1997
 msgid "Max. speed (km/h)"
 msgstr "Hámarkshraði (km/klst)"
@@ -23693,17 +23862,17 @@
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
-#: build/trans_presets.java:100 build/trans_presets.java:118
-#: build/trans_presets.java:138 build/trans_presets.java:158
-#: build/trans_presets.java:180 build/trans_presets.java:198
-#: build/trans_presets.java:220 build/trans_presets.java:240
-#: build/trans_presets.java:257 build/trans_presets.java:277
-#: build/trans_presets.java:296 build/trans_presets.java:315
-#: build/trans_presets.java:335 build/trans_presets.java:357
-#: build/trans_presets.java:370 build/trans_presets.java:390
-#: build/trans_presets.java:408 build/trans_presets.java:441
-#: build/trans_presets.java:499 build/trans_presets.java:530
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:660 build/trans_presets.java:1315
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:163 build/trans_presets.java:185
+#: build/trans_presets.java:209 build/trans_presets.java:229
+#: build/trans_presets.java:253 build/trans_presets.java:274
+#: build/trans_presets.java:291 build/trans_presets.java:312
+#: build/trans_presets.java:348 build/trans_presets.java:384
+#: build/trans_presets.java:425 build/trans_presets.java:464
+#: build/trans_presets.java:493 build/trans_presets.java:530
+#: build/trans_presets.java:567 build/trans_presets.java:716
+#: build/trans_presets.java:798 build/trans_presets.java:897
+#: build/trans_presets.java:969 build/trans_presets.java:1007
+#: build/trans_presets.java:1052 build/trans_presets.java:1092
+#: build/trans_presets.java:1166 build/trans_presets.java:1973
 msgid "Oneway"
 msgstr "Einstefnuvegur"
@@ -23744,18 +23913,18 @@
 #. </button>
 #. <button label="Bridge" hotkey="B" type="toggle">
-#: build/trans_presets.java:101 build/trans_presets.java:119
-#: build/trans_presets.java:140 build/trans_presets.java:160
-#: build/trans_presets.java:182 build/trans_presets.java:200
-#: build/trans_presets.java:221 build/trans_presets.java:241
-#: build/trans_presets.java:258 build/trans_presets.java:278
-#: build/trans_presets.java:297 build/trans_presets.java:316
-#: build/trans_presets.java:336 build/trans_presets.java:371
-#: build/trans_presets.java:391 build/trans_presets.java:442
-#: build/trans_presets.java:451 build/trans_presets.java:458
-#: build/trans_presets.java:494 build/trans_presets.java:525
-#: build/trans_presets.java:553 build/trans_presets.java:574
-#: build/trans_presets.java:598 build/trans_presets.java:621
-#: build/trans_presets.java:640 build/trans_presets.java:661
-#: build/trans_presets.java:1316 build/trans_surveyor.java:12
+#: build/trans_presets.java:122 build/trans_presets.java:142
+#: build/trans_presets.java:165 build/trans_presets.java:187
+#: build/trans_presets.java:211 build/trans_presets.java:231
+#: build/trans_presets.java:254 build/trans_presets.java:275
+#: build/trans_presets.java:292 build/trans_presets.java:313
+#: build/trans_presets.java:349 build/trans_presets.java:385
+#: build/trans_presets.java:426 build/trans_presets.java:494
+#: build/trans_presets.java:531 build/trans_presets.java:717
+#: build/trans_presets.java:728 build/trans_presets.java:735
+#: build/trans_presets.java:793 build/trans_presets.java:892
+#: build/trans_presets.java:970 build/trans_presets.java:1008
+#: build/trans_presets.java:1053 build/trans_presets.java:1093
+#: build/trans_presets.java:1129 build/trans_presets.java:1167
+#: build/trans_presets.java:1974 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brú"
@@ -23788,17 +23957,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:102 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:183 build/trans_presets.java:201
-#: build/trans_presets.java:222 build/trans_presets.java:242
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:298 build/trans_presets.java:317
-#: build/trans_presets.java:337 build/trans_presets.java:372
-#: build/trans_presets.java:392 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
-#: build/trans_presets.java:526 build/trans_presets.java:554
-#: build/trans_presets.java:575 build/trans_presets.java:599
-#: build/trans_presets.java:622 build/trans_presets.java:641
-#: build/trans_presets.java:662 build/trans_presets.java:1317
+#: build/trans_presets.java:123 build/trans_presets.java:143
+#: build/trans_presets.java:166 build/trans_presets.java:188
+#: build/trans_presets.java:212 build/trans_presets.java:232
+#: build/trans_presets.java:255 build/trans_presets.java:276
+#: build/trans_presets.java:293 build/trans_presets.java:314
+#: build/trans_presets.java:350 build/trans_presets.java:386
+#: build/trans_presets.java:427 build/trans_presets.java:495
+#: build/trans_presets.java:532 build/trans_presets.java:718
+#: build/trans_presets.java:750 build/trans_presets.java:794
+#: build/trans_presets.java:893 build/trans_presets.java:971
+#: build/trans_presets.java:1009 build/trans_presets.java:1054
+#: build/trans_presets.java:1094 build/trans_presets.java:1130
+#: build/trans_presets.java:1168 build/trans_presets.java:1975
 msgid "Tunnel"
 msgstr "Göng"
@@ -23829,17 +23998,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:103 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:162
-#: build/trans_presets.java:184 build/trans_presets.java:202
-#: build/trans_presets.java:223 build/trans_presets.java:243
-#: build/trans_presets.java:260 build/trans_presets.java:280
-#: build/trans_presets.java:299 build/trans_presets.java:318
-#: build/trans_presets.java:338 build/trans_presets.java:373
-#: build/trans_presets.java:393 build/trans_presets.java:444
-#: build/trans_presets.java:496 build/trans_presets.java:527
-#: build/trans_presets.java:555 build/trans_presets.java:576
-#: build/trans_presets.java:600 build/trans_presets.java:623
-#: build/trans_presets.java:642 build/trans_presets.java:663
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:124 build/trans_presets.java:144
+#: build/trans_presets.java:167 build/trans_presets.java:189
+#: build/trans_presets.java:213 build/trans_presets.java:233
+#: build/trans_presets.java:256 build/trans_presets.java:277
+#: build/trans_presets.java:294 build/trans_presets.java:315
+#: build/trans_presets.java:351 build/trans_presets.java:387
+#: build/trans_presets.java:428 build/trans_presets.java:496
+#: build/trans_presets.java:533 build/trans_presets.java:719
+#: build/trans_presets.java:795 build/trans_presets.java:894
+#: build/trans_presets.java:972 build/trans_presets.java:1010
+#: build/trans_presets.java:1055 build/trans_presets.java:1095
+#: build/trans_presets.java:1131 build/trans_presets.java:1169
+#: build/trans_presets.java:1976
 msgid "Cutting"
 msgstr "Niðurgrafinn"
@@ -23870,17 +24039,17 @@
 #. item "Ways/Steps" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:104 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:163
-#: build/trans_presets.java:185 build/trans_presets.java:203
-#: build/trans_presets.java:224 build/trans_presets.java:244
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:300 build/trans_presets.java:319
-#: build/trans_presets.java:339 build/trans_presets.java:374
-#: build/trans_presets.java:394 build/trans_presets.java:445
-#: build/trans_presets.java:497 build/trans_presets.java:528
-#: build/trans_presets.java:556 build/trans_presets.java:577
-#: build/trans_presets.java:601 build/trans_presets.java:624
-#: build/trans_presets.java:643 build/trans_presets.java:664
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:125 build/trans_presets.java:145
+#: build/trans_presets.java:168 build/trans_presets.java:190
+#: build/trans_presets.java:214 build/trans_presets.java:234
+#: build/trans_presets.java:257 build/trans_presets.java:278
+#: build/trans_presets.java:295 build/trans_presets.java:316
+#: build/trans_presets.java:352 build/trans_presets.java:388
+#: build/trans_presets.java:429 build/trans_presets.java:497
+#: build/trans_presets.java:534 build/trans_presets.java:720
+#: build/trans_presets.java:796 build/trans_presets.java:895
+#: build/trans_presets.java:973 build/trans_presets.java:1011
+#: build/trans_presets.java:1056 build/trans_presets.java:1096
+#: build/trans_presets.java:1132 build/trans_presets.java:1170
+#: build/trans_presets.java:1977
 msgid "Embankment"
 msgstr "Upphækkun"
@@ -23910,16 +24079,16 @@
 #. item "Ways/Dedicated Footway" check "Lit"
 #. item "Ways/Steps" check "Lit"
-#: build/trans_presets.java:105 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:164
-#: build/trans_presets.java:186 build/trans_presets.java:204
-#: build/trans_presets.java:225 build/trans_presets.java:245
-#: build/trans_presets.java:262 build/trans_presets.java:282
-#: build/trans_presets.java:301 build/trans_presets.java:320
-#: build/trans_presets.java:340 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:395
-#: build/trans_presets.java:498 build/trans_presets.java:529
-#: build/trans_presets.java:557 build/trans_presets.java:578
-#: build/trans_presets.java:602 build/trans_presets.java:625
-#: build/trans_presets.java:644 build/trans_presets.java:665
+#: build/trans_presets.java:126 build/trans_presets.java:146
+#: build/trans_presets.java:169 build/trans_presets.java:191
+#: build/trans_presets.java:215 build/trans_presets.java:235
+#: build/trans_presets.java:258 build/trans_presets.java:279
+#: build/trans_presets.java:296 build/trans_presets.java:317
+#: build/trans_presets.java:353 build/trans_presets.java:389
+#: build/trans_presets.java:430 build/trans_presets.java:482
+#: build/trans_presets.java:498 build/trans_presets.java:535
+#: build/trans_presets.java:797 build/trans_presets.java:896
+#: build/trans_presets.java:974 build/trans_presets.java:1012
+#: build/trans_presets.java:1057 build/trans_presets.java:1097
+#: build/trans_presets.java:1133 build/trans_presets.java:1171
 msgid "Lit"
 msgstr ""
@@ -23927,5 +24096,5 @@
 #. </optional>
 #. item "Highways/Streets/Motorway Link"
-#: build/trans_presets.java:108
+#: build/trans_presets.java:129
 msgid "Motorway Link"
 msgstr "Tengibraut á hraðbraut"
@@ -23934,5 +24103,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
 #. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
-#: build/trans_presets.java:111
+#: build/trans_presets.java:132
 msgid "Edit Motorway Link"
 msgstr "Breyti tengibraut á hraðbraut"
@@ -23940,5 +24109,5 @@
 #. </optional>
 #. item "Highways/Streets/Trunk"
-#: build/trans_presets.java:126
+#: build/trans_presets.java:149
 msgid "Trunk"
 msgstr "Stofnvegur"
@@ -23947,5 +24116,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
 #. item "Highways/Streets/Trunk" label "Edit Trunk"
-#: build/trans_presets.java:129
+#: build/trans_presets.java:152
 msgid "Edit Trunk"
 msgstr "Breyti stofnveg"
@@ -23955,6 +24124,6 @@
 #. item "Highways/Streets/Primary" check "Motorroad"
 #. item "Highways/Streets/Primary Link" check "Motorroad"
-#: build/trans_presets.java:139 build/trans_presets.java:159
-#: build/trans_presets.java:181 build/trans_presets.java:199
+#: build/trans_presets.java:164 build/trans_presets.java:186
+#: build/trans_presets.java:210 build/trans_presets.java:230
 msgid "Motorroad"
 msgstr "Hraðbrautarlíkar aðgangstakmarkanir"
@@ -23962,5 +24131,5 @@
 #. </optional>
 #. item "Highways/Streets/Trunk Link"
-#: build/trans_presets.java:147
+#: build/trans_presets.java:172
 msgid "Trunk Link"
 msgstr "Tengivegur á stofnveg"
@@ -23969,5 +24138,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
 #. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
-#: build/trans_presets.java:150
+#: build/trans_presets.java:175
 msgid "Edit Trunk Link"
 msgstr "Breyti tengiveg á stofnveg"
@@ -23980,5 +24149,5 @@
 #. </button>
 #. <button label="Primary" hotkey="2">
-#: build/trans_presets.java:168 build/trans_surveyor.java:76
+#: build/trans_presets.java:195 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Fyrsta stigs"
@@ -23987,5 +24156,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
 #. item "Highways/Streets/Primary" label "Edit Primary Road"
-#: build/trans_presets.java:171
+#: build/trans_presets.java:198
 msgid "Edit Primary Road"
 msgstr "Breyti fyrsta stigs veg"
@@ -23993,5 +24162,5 @@
 #. </optional>
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:189
+#: build/trans_presets.java:218
 msgid "Primary Link"
 msgstr "Tengivegur á fyrsta stigs veg"
@@ -23999,5 +24168,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary_link" />
 #. item "Highways/Streets/Primary Link" label "Edit Primary Link"
-#: build/trans_presets.java:191
+#: build/trans_presets.java:220
 msgid "Edit Primary Link"
 msgstr ""
@@ -24009,5 +24178,5 @@
 #. </button>
 #. <button label="Secondary" hotkey="3">
-#: build/trans_presets.java:207 build/trans_surveyor.java:80
+#: build/trans_presets.java:238 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Annars stigs vegur"
@@ -24017,5 +24186,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
 #. item "Highways/Streets/Secondary" label "Edit Secondary Road"
-#: build/trans_presets.java:211
+#: build/trans_presets.java:242
 msgid "Edit Secondary Road"
 msgstr "Breyti annars stigs veg"
@@ -24023,5 +24192,5 @@
 #. </optional>
 #. item "Highways/Streets/Tertiary"
-#: build/trans_presets.java:228
+#: build/trans_presets.java:261
 msgid "Tertiary"
 msgstr "Þriðja stigs vegur"
@@ -24031,5 +24200,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
 #. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
-#: build/trans_presets.java:232
+#: build/trans_presets.java:265
 msgid "Edit Tertiary Road"
 msgstr "Breyti þriðja stigs veg"
@@ -24041,5 +24210,5 @@
 #. </button>
 #. <button label="Unclassified" hotkey="4">
-#: build/trans_presets.java:248 build/trans_surveyor.java:84
+#: build/trans_presets.java:282 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Óflokkaður"
@@ -24049,5 +24218,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
 #. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
-#: build/trans_presets.java:252
+#: build/trans_presets.java:286
 msgid "Edit Unclassified Road"
 msgstr "Breyti óflokkuðum veg"
@@ -24057,6 +24226,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Dedicated Footway" check "Passing Places"
-#: build/trans_presets.java:263 build/trans_presets.java:341
-#: build/trans_presets.java:626 build/trans_presets.java:645
+#: build/trans_presets.java:297 build/trans_presets.java:431
+#: build/trans_presets.java:1098 build/trans_presets.java:1134
 msgid "Passing Places"
 msgstr ""
@@ -24083,15 +24252,15 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:266 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:323
-#: build/trans_presets.java:345 build/trans_presets.java:379
-#: build/trans_presets.java:400 build/trans_presets.java:448
-#: build/trans_presets.java:464 build/trans_presets.java:478
-#: build/trans_presets.java:504 build/trans_presets.java:540
-#: build/trans_presets.java:560 build/trans_presets.java:581
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:647 build/trans_presets.java:667
-#: build/trans_presets.java:1323 build/trans_presets.java:1612
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:301 build/trans_presets.java:337
+#: build/trans_presets.java:373 build/trans_presets.java:409
+#: build/trans_presets.java:452 build/trans_presets.java:519
+#: build/trans_presets.java:559 build/trans_presets.java:725
+#: build/trans_presets.java:747 build/trans_presets.java:762
+#: build/trans_presets.java:840 build/trans_presets.java:941
+#: build/trans_presets.java:978 build/trans_presets.java:1020
+#: build/trans_presets.java:1060 build/trans_presets.java:1101
+#: build/trans_presets.java:1137 build/trans_presets.java:1174
+#: build/trans_presets.java:1998 build/trans_presets.java:2415
+#: build/trans_presets.java:2469
 msgid "Width (meters)"
 msgstr "Breidd (í metrum)"
@@ -24103,5 +24272,5 @@
 #. </button>
 #. <button label="Residential" hotkey="5">
-#: build/trans_presets.java:269 build/trans_surveyor.java:88
+#: build/trans_presets.java:304 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Íbúðargata"
@@ -24110,5 +24279,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
 #. item "Highways/Streets/Residential" label "Edit Residential Street"
-#: build/trans_presets.java:272
+#: build/trans_presets.java:307
 msgid "Edit Residential Street"
 msgstr "Breyti íbúðargötu"
@@ -24130,12 +24299,12 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:492
-#: build/trans_presets.java:522 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:596
-#: build/trans_presets.java:619 build/trans_presets.java:639
-#: build/trans_presets.java:659 build/trans_presets.java:1321
+#: build/trans_presets.java:320 build/trans_presets.java:356
+#: build/trans_presets.java:392 build/trans_presets.java:434
+#: build/trans_presets.java:465 build/trans_presets.java:501
+#: build/trans_presets.java:538 build/trans_presets.java:782
+#: build/trans_presets.java:865 build/trans_presets.java:952
+#: build/trans_presets.java:990 build/trans_presets.java:1035
+#: build/trans_presets.java:1075 build/trans_presets.java:1112
+#: build/trans_presets.java:1149 build/trans_presets.java:1980
 msgid "Surface"
 msgstr "Slitlag"
@@ -24157,12 +24326,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:492
-#: build/trans_presets.java:522 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:596
-#: build/trans_presets.java:619 build/trans_presets.java:639
-#: build/trans_presets.java:659 build/trans_presets.java:1321
+#: build/trans_presets.java:321 build/trans_presets.java:357
+#: build/trans_presets.java:393 build/trans_presets.java:435
+#: build/trans_presets.java:466 build/trans_presets.java:502
+#: build/trans_presets.java:539 build/trans_presets.java:783
+#: build/trans_presets.java:866 build/trans_presets.java:953
+#: build/trans_presets.java:991 build/trans_presets.java:1036
+#: build/trans_presets.java:1076 build/trans_presets.java:1113
+#: build/trans_presets.java:1150 build/trans_presets.java:1981
 msgid "paved"
 msgstr "malbikaður"
@@ -24183,12 +24352,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:522
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:322 build/trans_presets.java:358
+#: build/trans_presets.java:394 build/trans_presets.java:436
+#: build/trans_presets.java:467 build/trans_presets.java:503
+#: build/trans_presets.java:540 build/trans_presets.java:867
+#: build/trans_presets.java:954 build/trans_presets.java:992
+#: build/trans_presets.java:1037 build/trans_presets.java:1077
+#: build/trans_presets.java:1114 build/trans_presets.java:1151
+#: build/trans_presets.java:1982
 msgid "unpaved"
 msgstr "ómalbikaður"
@@ -24209,12 +24378,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:522
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:323 build/trans_presets.java:359
+#: build/trans_presets.java:395 build/trans_presets.java:437
+#: build/trans_presets.java:468 build/trans_presets.java:504
+#: build/trans_presets.java:541 build/trans_presets.java:868
+#: build/trans_presets.java:955 build/trans_presets.java:993
+#: build/trans_presets.java:1038 build/trans_presets.java:1078
+#: build/trans_presets.java:1115 build/trans_presets.java:1152
+#: build/trans_presets.java:1983
 msgid "asphalt"
 msgstr ""
@@ -24236,12 +24405,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:492
-#: build/trans_presets.java:522 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:596
-#: build/trans_presets.java:619 build/trans_presets.java:639
-#: build/trans_presets.java:659 build/trans_presets.java:1321
+#: build/trans_presets.java:324 build/trans_presets.java:360
+#: build/trans_presets.java:396 build/trans_presets.java:438
+#: build/trans_presets.java:469 build/trans_presets.java:505
+#: build/trans_presets.java:542 build/trans_presets.java:784
+#: build/trans_presets.java:869 build/trans_presets.java:956
+#: build/trans_presets.java:994 build/trans_presets.java:1039
+#: build/trans_presets.java:1079 build/trans_presets.java:1116
+#: build/trans_presets.java:1153 build/trans_presets.java:1984
 msgid "concrete"
 msgstr ""
@@ -24263,12 +24432,12 @@
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:522
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1321 build/trans_presets.java:2498
+#: build/trans_presets.java:325 build/trans_presets.java:361
+#: build/trans_presets.java:397 build/trans_presets.java:439
+#: build/trans_presets.java:470 build/trans_presets.java:506
+#: build/trans_presets.java:543 build/trans_presets.java:870
+#: build/trans_presets.java:957 build/trans_presets.java:995
+#: build/trans_presets.java:1040 build/trans_presets.java:1080
+#: build/trans_presets.java:1117 build/trans_presets.java:1154
+#: build/trans_presets.java:1985 build/trans_presets.java:3816
 msgid "metal"
 msgstr ""
@@ -24291,13 +24460,13 @@
 #. item "Leisure/Public Grill" combo "Fuel" display value
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:522
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1321 build/trans_presets.java:2200
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:326 build/trans_presets.java:362
+#: build/trans_presets.java:398 build/trans_presets.java:440
+#: build/trans_presets.java:471 build/trans_presets.java:507
+#: build/trans_presets.java:544 build/trans_presets.java:871
+#: build/trans_presets.java:958 build/trans_presets.java:996
+#: build/trans_presets.java:1041 build/trans_presets.java:1081
+#: build/trans_presets.java:1118 build/trans_presets.java:1155
+#: build/trans_presets.java:1986 build/trans_presets.java:3420
+#: build/trans_presets.java:3817
 msgid "wood"
 msgstr "skógur"
@@ -24318,12 +24487,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:522
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:327 build/trans_presets.java:363
+#: build/trans_presets.java:399 build/trans_presets.java:441
+#: build/trans_presets.java:472 build/trans_presets.java:508
+#: build/trans_presets.java:545 build/trans_presets.java:872
+#: build/trans_presets.java:959 build/trans_presets.java:997
+#: build/trans_presets.java:1042 build/trans_presets.java:1082
+#: build/trans_presets.java:1119 build/trans_presets.java:1156
+#: build/trans_presets.java:1987
 msgid "paving_stones"
 msgstr ""
@@ -24345,12 +24514,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:492
-#: build/trans_presets.java:522 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:596
-#: build/trans_presets.java:619 build/trans_presets.java:639
-#: build/trans_presets.java:659 build/trans_presets.java:1321
+#: build/trans_presets.java:328 build/trans_presets.java:364
+#: build/trans_presets.java:400 build/trans_presets.java:442
+#: build/trans_presets.java:473 build/trans_presets.java:509
+#: build/trans_presets.java:546 build/trans_presets.java:785
+#: build/trans_presets.java:873 build/trans_presets.java:960
+#: build/trans_presets.java:998 build/trans_presets.java:1043
+#: build/trans_presets.java:1083 build/trans_presets.java:1120
+#: build/trans_presets.java:1157 build/trans_presets.java:1988
 msgid "cobblestone"
 msgstr "götusteinn"
@@ -24372,12 +24541,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:492
-#: build/trans_presets.java:522 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:596
-#: build/trans_presets.java:619 build/trans_presets.java:639
-#: build/trans_presets.java:659 build/trans_presets.java:1321
+#: build/trans_presets.java:329 build/trans_presets.java:365
+#: build/trans_presets.java:401 build/trans_presets.java:443
+#: build/trans_presets.java:474 build/trans_presets.java:510
+#: build/trans_presets.java:547 build/trans_presets.java:786
+#: build/trans_presets.java:874 build/trans_presets.java:961
+#: build/trans_presets.java:999 build/trans_presets.java:1044
+#: build/trans_presets.java:1084 build/trans_presets.java:1121
+#: build/trans_presets.java:1158 build/trans_presets.java:1989
 msgid "gravel"
 msgstr ""
@@ -24398,12 +24567,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:522
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:330 build/trans_presets.java:366
+#: build/trans_presets.java:402 build/trans_presets.java:444
+#: build/trans_presets.java:475 build/trans_presets.java:511
+#: build/trans_presets.java:548 build/trans_presets.java:875
+#: build/trans_presets.java:962 build/trans_presets.java:1000
+#: build/trans_presets.java:1045 build/trans_presets.java:1085
+#: build/trans_presets.java:1122 build/trans_presets.java:1159
+#: build/trans_presets.java:1990
 msgid "pebblestone"
 msgstr ""
@@ -24424,12 +24593,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:522
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:331 build/trans_presets.java:367
+#: build/trans_presets.java:403 build/trans_presets.java:445
+#: build/trans_presets.java:476 build/trans_presets.java:512
+#: build/trans_presets.java:549 build/trans_presets.java:876
+#: build/trans_presets.java:963 build/trans_presets.java:1001
+#: build/trans_presets.java:1046 build/trans_presets.java:1086
+#: build/trans_presets.java:1123 build/trans_presets.java:1160
+#: build/trans_presets.java:1991
 msgid "compacted"
 msgstr ""
@@ -24450,12 +24619,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:522
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:332 build/trans_presets.java:368
+#: build/trans_presets.java:404 build/trans_presets.java:446
+#: build/trans_presets.java:477 build/trans_presets.java:513
+#: build/trans_presets.java:550 build/trans_presets.java:877
+#: build/trans_presets.java:964 build/trans_presets.java:1002
+#: build/trans_presets.java:1047 build/trans_presets.java:1087
+#: build/trans_presets.java:1124 build/trans_presets.java:1161
+#: build/trans_presets.java:1992
 msgid "grass_paver"
 msgstr ""
@@ -24477,12 +24646,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:492
-#: build/trans_presets.java:522 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:596
-#: build/trans_presets.java:619 build/trans_presets.java:639
-#: build/trans_presets.java:659 build/trans_presets.java:1321
+#: build/trans_presets.java:333 build/trans_presets.java:369
+#: build/trans_presets.java:405 build/trans_presets.java:447
+#: build/trans_presets.java:478 build/trans_presets.java:514
+#: build/trans_presets.java:551 build/trans_presets.java:788
+#: build/trans_presets.java:878 build/trans_presets.java:965
+#: build/trans_presets.java:1003 build/trans_presets.java:1048
+#: build/trans_presets.java:1088 build/trans_presets.java:1125
+#: build/trans_presets.java:1162 build/trans_presets.java:1993
 msgid "grass"
 msgstr ""
@@ -24504,12 +24673,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:492
-#: build/trans_presets.java:522 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:596
-#: build/trans_presets.java:619 build/trans_presets.java:639
-#: build/trans_presets.java:659 build/trans_presets.java:1321
+#: build/trans_presets.java:334 build/trans_presets.java:370
+#: build/trans_presets.java:406 build/trans_presets.java:448
+#: build/trans_presets.java:479 build/trans_presets.java:515
+#: build/trans_presets.java:552 build/trans_presets.java:789
+#: build/trans_presets.java:879 build/trans_presets.java:966
+#: build/trans_presets.java:1004 build/trans_presets.java:1049
+#: build/trans_presets.java:1089 build/trans_presets.java:1126
+#: build/trans_presets.java:1163 build/trans_presets.java:1994
 msgid "sand"
 msgstr ""
@@ -24532,13 +24701,13 @@
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:284 build/trans_presets.java:303
-#: build/trans_presets.java:322 build/trans_presets.java:343
-#: build/trans_presets.java:358 build/trans_presets.java:377
-#: build/trans_presets.java:397 build/trans_presets.java:492
-#: build/trans_presets.java:522 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:596
-#: build/trans_presets.java:619 build/trans_presets.java:639
-#: build/trans_presets.java:659 build/trans_presets.java:1321
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:335 build/trans_presets.java:371
+#: build/trans_presets.java:407 build/trans_presets.java:449
+#: build/trans_presets.java:480 build/trans_presets.java:516
+#: build/trans_presets.java:553 build/trans_presets.java:787
+#: build/trans_presets.java:880 build/trans_presets.java:967
+#: build/trans_presets.java:1005 build/trans_presets.java:1050
+#: build/trans_presets.java:1090 build/trans_presets.java:1127
+#: build/trans_presets.java:1164 build/trans_presets.java:1995
+#: build/trans_presets.java:3776
 msgid "ground"
 msgstr ""
@@ -24546,5 +24715,5 @@
 #. </optional>
 #. item "Highways/Streets/Living Street"
-#: build/trans_presets.java:288
+#: build/trans_presets.java:340
 msgid "Living Street"
 msgstr "Vistgata"
@@ -24553,5 +24722,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
 #. item "Highways/Streets/Living Street" label "Edit Living Street"
-#: build/trans_presets.java:291
+#: build/trans_presets.java:343
 msgid "Edit Living Street"
 msgstr "Breyti vistgötu"
@@ -24559,5 +24728,5 @@
 #. </optional>
 #. item "Highways/Streets/Pedestrian"
-#: build/trans_presets.java:307
+#: build/trans_presets.java:376
 msgid "Pedestrian"
 msgstr "Göngugata"
@@ -24566,5 +24735,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
 #. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
-#: build/trans_presets.java:310
+#: build/trans_presets.java:379
 msgid "Edit Pedestrian Street"
 msgstr "Breyti göngugötu"
@@ -24572,5 +24741,5 @@
 #. </optional>
 #. item "Highways/Streets/Service"
-#: build/trans_presets.java:326
+#: build/trans_presets.java:412
 msgid "Service"
 msgstr "Þjónustuvegur"
@@ -24579,5 +24748,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
 #. item "Highways/Streets/Service" label "Edit Serviceway"
-#: build/trans_presets.java:329
+#: build/trans_presets.java:415
 msgid "Edit Serviceway"
 msgstr "Breyta þjónustuveg"
@@ -24587,20 +24756,20 @@
 #. <optional>
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:333
+#: build/trans_presets.java:419
 msgid "Serviceway type"
 msgstr "Gerð þjónustuvegs"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:333
+#: build/trans_presets.java:420
 msgid "alley"
 msgstr "port"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:333
+#: build/trans_presets.java:421
 msgid "driveway"
 msgstr "heimreið"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:333
+#: build/trans_presets.java:422
 msgid "parking_aisle"
 msgstr "bílastæðavegur"
@@ -24608,5 +24777,5 @@
 #. </optional>
 #. item "Highways/Streets/Parking Aisle"
-#: build/trans_presets.java:348
+#: build/trans_presets.java:455
 msgid "Parking Aisle"
 msgstr "Bílastæðavegur"
@@ -24616,5 +24785,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
 #. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:459
 msgid "Edit Parking Aisle"
 msgstr "Breyti bílastæðaveg"
@@ -24622,5 +24791,5 @@
 #. </optional>
 #. item "Highways/Streets/Road (Unknown Type)"
-#: build/trans_presets.java:362
+#: build/trans_presets.java:485
 msgid "Road (Unknown Type)"
 msgstr "Vegur (óþekkt flokkun)"
@@ -24629,5 +24798,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
 #. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:488
 msgid "Edit Road of unknown type"
 msgstr "Breyti veg af óþekktri flokkun"
@@ -24635,15 +24804,15 @@
 #. </optional>
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:382
+#: build/trans_presets.java:522
 msgid "Construction"
 msgstr "Í byggingu"
 
 #. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:523
 msgid "Edit Highway Under Construction"
 msgstr "Breyti veg í byggingu"
 
 #. item "Highways/Streets/Construction" combo "Junction"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:555
 msgid "Junction"
 msgstr "Hringtorg"
@@ -24689,5 +24858,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:398 build/trans_style.java:739
+#: build/trans_presets.java:556 build/trans_style.java:739
 msgid "roundabout"
 msgstr "hringtorg"
@@ -24696,5 +24865,5 @@
 #. <separator/>
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:404
+#: build/trans_presets.java:563
 msgid "Road Restrictions"
 msgstr "Vegtakmarkanir"
@@ -24703,15 +24872,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
-#: build/trans_presets.java:407
+#: build/trans_presets.java:566
 msgid "Edit Road Restrictions"
 msgstr "Breyti vegtakmörkunum"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:568
 msgid "Toll"
 msgstr "Tollur"
 
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
-#: build/trans_presets.java:410
+#: build/trans_presets.java:569
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -24720,6 +24889,6 @@
 #. item "Ways/Track" combo "Access"
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:411 build/trans_presets.java:501
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:570 build/trans_presets.java:801
+#: build/trans_presets.java:3387
 msgid "Access"
 msgstr "Aðgangur"
@@ -24845,64 +25014,64 @@
 #. item "Facilities/Hunting Stand" combo "Lock" display value
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe" display value
-#: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:413 build/trans_presets.java:414
-#: build/trans_presets.java:415 build/trans_presets.java:416
-#: build/trans_presets.java:417 build/trans_presets.java:418
-#: build/trans_presets.java:419 build/trans_presets.java:420
-#: build/trans_presets.java:458 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:503
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:536
-#: build/trans_presets.java:537 build/trans_presets.java:579
-#: build/trans_presets.java:742 build/trans_presets.java:1231
-#: build/trans_presets.java:1243 build/trans_presets.java:1255
-#: build/trans_presets.java:1267 build/trans_presets.java:1279
-#: build/trans_presets.java:1291 build/trans_presets.java:1303
-#: build/trans_presets.java:1414 build/trans_presets.java:1415
-#: build/trans_presets.java:1418 build/trans_presets.java:1419
-#: build/trans_presets.java:1420 build/trans_presets.java:1435
-#: build/trans_presets.java:1526 build/trans_presets.java:1538
-#: build/trans_presets.java:1539 build/trans_presets.java:1540
-#: build/trans_presets.java:1541 build/trans_presets.java:1542
-#: build/trans_presets.java:1646 build/trans_presets.java:1647
-#: build/trans_presets.java:1648 build/trans_presets.java:1766
-#: build/trans_presets.java:1767 build/trans_presets.java:1768
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1785 build/trans_presets.java:1786
-#: build/trans_presets.java:1787 build/trans_presets.java:1800
-#: build/trans_presets.java:1801 build/trans_presets.java:1802
-#: build/trans_presets.java:1803 build/trans_presets.java:1817
-#: build/trans_presets.java:1818 build/trans_presets.java:1819
-#: build/trans_presets.java:1820 build/trans_presets.java:1835
-#: build/trans_presets.java:1836 build/trans_presets.java:1837
-#: build/trans_presets.java:1838 build/trans_presets.java:1852
-#: build/trans_presets.java:1853 build/trans_presets.java:1854
-#: build/trans_presets.java:1855 build/trans_presets.java:1869
-#: build/trans_presets.java:1870 build/trans_presets.java:1871
-#: build/trans_presets.java:1872 build/trans_presets.java:1875
-#: build/trans_presets.java:1891 build/trans_presets.java:1892
-#: build/trans_presets.java:1893 build/trans_presets.java:1894
-#: build/trans_presets.java:1914 build/trans_presets.java:1915
-#: build/trans_presets.java:1916 build/trans_presets.java:1917
-#: build/trans_presets.java:1933 build/trans_presets.java:1934
-#: build/trans_presets.java:1935 build/trans_presets.java:1936
-#: build/trans_presets.java:1950 build/trans_presets.java:1951
-#: build/trans_presets.java:1952 build/trans_presets.java:1953
-#: build/trans_presets.java:1969 build/trans_presets.java:1970
-#: build/trans_presets.java:1971 build/trans_presets.java:1972
-#: build/trans_presets.java:1988 build/trans_presets.java:1989
-#: build/trans_presets.java:1990 build/trans_presets.java:1991
-#: build/trans_presets.java:2004 build/trans_presets.java:2005
-#: build/trans_presets.java:2006 build/trans_presets.java:2007
-#: build/trans_presets.java:2021 build/trans_presets.java:2022
-#: build/trans_presets.java:2023 build/trans_presets.java:2024
-#: build/trans_presets.java:2038 build/trans_presets.java:2039
-#: build/trans_presets.java:2118 build/trans_presets.java:2128
-#: build/trans_presets.java:2178 build/trans_presets.java:2199
-#: build/trans_presets.java:2384 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2497
-#: build/trans_presets.java:2512 build/trans_presets.java:2513
-#: build/trans_presets.java:2514 build/trans_presets.java:2935
+#: build/trans_presets.java:571 build/trans_presets.java:582
+#: build/trans_presets.java:591 build/trans_presets.java:601
+#: build/trans_presets.java:611 build/trans_presets.java:624
+#: build/trans_presets.java:637 build/trans_presets.java:646
+#: build/trans_presets.java:659 build/trans_presets.java:672
+#: build/trans_presets.java:736 build/trans_presets.java:802
+#: build/trans_presets.java:815 build/trans_presets.java:828
+#: build/trans_presets.java:899 build/trans_presets.java:905
+#: build/trans_presets.java:911 build/trans_presets.java:918
+#: build/trans_presets.java:922 build/trans_presets.java:928
+#: build/trans_presets.java:934 build/trans_presets.java:1015
+#: build/trans_presets.java:1280 build/trans_presets.java:1807
+#: build/trans_presets.java:1832 build/trans_presets.java:1856
+#: build/trans_presets.java:1881 build/trans_presets.java:1906
+#: build/trans_presets.java:1931 build/trans_presets.java:1956
+#: build/trans_presets.java:2105 build/trans_presets.java:2109
+#: build/trans_presets.java:2115 build/trans_presets.java:2120
+#: build/trans_presets.java:2125 build/trans_presets.java:2171
+#: build/trans_presets.java:2291 build/trans_presets.java:2317
+#: build/trans_presets.java:2322 build/trans_presets.java:2328
+#: build/trans_presets.java:2336 build/trans_presets.java:2342
+#: build/trans_presets.java:2450 build/trans_presets.java:2454
+#: build/trans_presets.java:2458 build/trans_presets.java:2580
+#: build/trans_presets.java:2587 build/trans_presets.java:2591
+#: build/trans_presets.java:2598 build/trans_presets.java:2617
+#: build/trans_presets.java:2624 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2663
+#: build/trans_presets.java:2670 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2699
+#: build/trans_presets.java:2706 build/trans_presets.java:2725
+#: build/trans_presets.java:2732 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2760
+#: build/trans_presets.java:2767 build/trans_presets.java:2771
+#: build/trans_presets.java:2778 build/trans_presets.java:2796
+#: build/trans_presets.java:2803 build/trans_presets.java:2807
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2841 build/trans_presets.java:2848
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2966 build/trans_presets.java:2973
+#: build/trans_presets.java:2977 build/trans_presets.java:2984
+#: build/trans_presets.java:3005 build/trans_presets.java:3012
+#: build/trans_presets.java:3016 build/trans_presets.java:3023
+#: build/trans_presets.java:3048 build/trans_presets.java:3055
+#: build/trans_presets.java:3059 build/trans_presets.java:3066
+#: build/trans_presets.java:3089 build/trans_presets.java:3096
+#: build/trans_presets.java:3100 build/trans_presets.java:3107
+#: build/trans_presets.java:3127 build/trans_presets.java:3134
+#: build/trans_presets.java:3138 build/trans_presets.java:3145
+#: build/trans_presets.java:3166 build/trans_presets.java:3173
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3205 build/trans_presets.java:3212
+#: build/trans_presets.java:3311 build/trans_presets.java:3324
+#: build/trans_presets.java:3388 build/trans_presets.java:3414
+#: build/trans_presets.java:3662 build/trans_presets.java:3732
+#: build/trans_presets.java:3738 build/trans_presets.java:3811
+#: build/trans_presets.java:3847 build/trans_presets.java:3852
+#: build/trans_presets.java:3857 build/trans_presets.java:4697
 msgid "yes"
 msgstr "já"
@@ -24926,11 +25095,11 @@
 #. <condition k="access" v="private"/>
 #. color private
-#: build/trans_presets.java:411 build/trans_presets.java:413
-#: build/trans_presets.java:414 build/trans_presets.java:415
-#: build/trans_presets.java:416 build/trans_presets.java:417
-#: build/trans_presets.java:418 build/trans_presets.java:419
-#: build/trans_presets.java:420 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:503
-#: build/trans_presets.java:2178 build/trans_style.java:175
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:602 build/trans_presets.java:612
+#: build/trans_presets.java:625 build/trans_presets.java:638
+#: build/trans_presets.java:647 build/trans_presets.java:660
+#: build/trans_presets.java:673 build/trans_presets.java:803
+#: build/trans_presets.java:816 build/trans_presets.java:829
+#: build/trans_presets.java:3390 build/trans_style.java:175
 msgid "private"
 msgstr "einkavegur"
@@ -24953,10 +25122,10 @@
 #. <condition k="access" v="destination"/>
 #. color destination
-#: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:413 build/trans_presets.java:414
-#: build/trans_presets.java:415 build/trans_presets.java:416
-#: build/trans_presets.java:418 build/trans_presets.java:419
-#: build/trans_presets.java:420 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:573 build/trans_presets.java:584
+#: build/trans_presets.java:595 build/trans_presets.java:605
+#: build/trans_presets.java:615 build/trans_presets.java:628
+#: build/trans_presets.java:649 build/trans_presets.java:663
+#: build/trans_presets.java:676 build/trans_presets.java:806
+#: build/trans_presets.java:819 build/trans_presets.java:832
 #: build/trans_style.java:180
 msgid "destination"
@@ -24990,11 +25159,11 @@
 #. <condition k="access" v="permissive"/>
 #. color permissive
-#: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:413 build/trans_presets.java:414
-#: build/trans_presets.java:415 build/trans_presets.java:416
-#: build/trans_presets.java:417 build/trans_presets.java:418
-#: build/trans_presets.java:419 build/trans_presets.java:420
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:503 build/trans_presets.java:2178
+#: build/trans_presets.java:574 build/trans_presets.java:585
+#: build/trans_presets.java:596 build/trans_presets.java:606
+#: build/trans_presets.java:616 build/trans_presets.java:629
+#: build/trans_presets.java:641 build/trans_presets.java:651
+#: build/trans_presets.java:664 build/trans_presets.java:677
+#: build/trans_presets.java:807 build/trans_presets.java:820
+#: build/trans_presets.java:833 build/trans_presets.java:3389
 #: build/trans_style.java:170
 msgid "permissive"
@@ -25009,8 +25178,8 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: build/trans_presets.java:411 build/trans_presets.java:415
-#: build/trans_presets.java:416 build/trans_presets.java:418
-#: build/trans_presets.java:419 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:575 build/trans_presets.java:617
+#: build/trans_presets.java:630 build/trans_presets.java:652
+#: build/trans_presets.java:665 build/trans_presets.java:808
+#: build/trans_presets.java:821 build/trans_presets.java:834
 msgid "agricultural"
 msgstr "í landbúnaðarskyni"
@@ -25024,8 +25193,8 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: build/trans_presets.java:411 build/trans_presets.java:415
-#: build/trans_presets.java:416 build/trans_presets.java:418
-#: build/trans_presets.java:419 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:576 build/trans_presets.java:618
+#: build/trans_presets.java:631 build/trans_presets.java:653
+#: build/trans_presets.java:666 build/trans_presets.java:809
+#: build/trans_presets.java:822 build/trans_presets.java:835
 msgid "forestry"
 msgstr ""
@@ -25040,9 +25209,9 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:415 build/trans_presets.java:416
-#: build/trans_presets.java:418 build/trans_presets.java:419
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:503
+#: build/trans_presets.java:577 build/trans_presets.java:586
+#: build/trans_presets.java:619 build/trans_presets.java:632
+#: build/trans_presets.java:654 build/trans_presets.java:667
+#: build/trans_presets.java:810 build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "delivery"
 msgstr ""
@@ -25171,71 +25340,71 @@
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:413 build/trans_presets.java:414
-#: build/trans_presets.java:415 build/trans_presets.java:416
-#: build/trans_presets.java:417 build/trans_presets.java:418
-#: build/trans_presets.java:419 build/trans_presets.java:420
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:503 build/trans_presets.java:524
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:536
-#: build/trans_presets.java:537 build/trans_presets.java:579
-#: build/trans_presets.java:711 build/trans_presets.java:733
-#: build/trans_presets.java:1231 build/trans_presets.java:1243
-#: build/trans_presets.java:1255 build/trans_presets.java:1267
-#: build/trans_presets.java:1279 build/trans_presets.java:1291
-#: build/trans_presets.java:1303 build/trans_presets.java:1345
-#: build/trans_presets.java:1414 build/trans_presets.java:1415
-#: build/trans_presets.java:1418 build/trans_presets.java:1419
-#: build/trans_presets.java:1420 build/trans_presets.java:1435
-#: build/trans_presets.java:1526 build/trans_presets.java:1538
-#: build/trans_presets.java:1539 build/trans_presets.java:1540
-#: build/trans_presets.java:1541 build/trans_presets.java:1542
-#: build/trans_presets.java:1646 build/trans_presets.java:1647
-#: build/trans_presets.java:1648 build/trans_presets.java:1766
-#: build/trans_presets.java:1767 build/trans_presets.java:1768
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1785 build/trans_presets.java:1786
-#: build/trans_presets.java:1787 build/trans_presets.java:1800
-#: build/trans_presets.java:1801 build/trans_presets.java:1802
-#: build/trans_presets.java:1803 build/trans_presets.java:1817
-#: build/trans_presets.java:1818 build/trans_presets.java:1819
-#: build/trans_presets.java:1820 build/trans_presets.java:1835
-#: build/trans_presets.java:1836 build/trans_presets.java:1837
-#: build/trans_presets.java:1838 build/trans_presets.java:1852
-#: build/trans_presets.java:1853 build/trans_presets.java:1854
-#: build/trans_presets.java:1855 build/trans_presets.java:1869
-#: build/trans_presets.java:1870 build/trans_presets.java:1871
-#: build/trans_presets.java:1872 build/trans_presets.java:1875
-#: build/trans_presets.java:1891 build/trans_presets.java:1892
-#: build/trans_presets.java:1893 build/trans_presets.java:1894
-#: build/trans_presets.java:1914 build/trans_presets.java:1915
-#: build/trans_presets.java:1916 build/trans_presets.java:1917
-#: build/trans_presets.java:1933 build/trans_presets.java:1934
-#: build/trans_presets.java:1935 build/trans_presets.java:1936
-#: build/trans_presets.java:1950 build/trans_presets.java:1951
-#: build/trans_presets.java:1952 build/trans_presets.java:1953
-#: build/trans_presets.java:1969 build/trans_presets.java:1970
-#: build/trans_presets.java:1971 build/trans_presets.java:1972
-#: build/trans_presets.java:1988 build/trans_presets.java:1989
-#: build/trans_presets.java:1990 build/trans_presets.java:1991
-#: build/trans_presets.java:2004 build/trans_presets.java:2005
-#: build/trans_presets.java:2006 build/trans_presets.java:2007
-#: build/trans_presets.java:2021 build/trans_presets.java:2022
-#: build/trans_presets.java:2023 build/trans_presets.java:2024
-#: build/trans_presets.java:2038 build/trans_presets.java:2039
-#: build/trans_presets.java:2118 build/trans_presets.java:2128
-#: build/trans_presets.java:2199 build/trans_presets.java:2384
-#: build/trans_presets.java:2439 build/trans_presets.java:2440
-#: build/trans_presets.java:2497 build/trans_presets.java:2512
-#: build/trans_presets.java:2513 build/trans_presets.java:2514
-#: build/trans_presets.java:2935 build/trans_presets.java:3018
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:579 build/trans_presets.java:588
+#: build/trans_presets.java:598 build/trans_presets.java:608
+#: build/trans_presets.java:621 build/trans_presets.java:634
+#: build/trans_presets.java:643 build/trans_presets.java:656
+#: build/trans_presets.java:669 build/trans_presets.java:679
+#: build/trans_presets.java:812 build/trans_presets.java:825
+#: build/trans_presets.java:838 build/trans_presets.java:890
+#: build/trans_presets.java:902 build/trans_presets.java:908
+#: build/trans_presets.java:914 build/trans_presets.java:919
+#: build/trans_presets.java:925 build/trans_presets.java:931
+#: build/trans_presets.java:936 build/trans_presets.java:1016
+#: build/trans_presets.java:1223 build/trans_presets.java:1261
+#: build/trans_presets.java:1806 build/trans_presets.java:1831
+#: build/trans_presets.java:1855 build/trans_presets.java:1880
+#: build/trans_presets.java:1905 build/trans_presets.java:1930
+#: build/trans_presets.java:1955 build/trans_presets.java:2029
+#: build/trans_presets.java:2106 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2121
+#: build/trans_presets.java:2126 build/trans_presets.java:2174
+#: build/trans_presets.java:2292 build/trans_presets.java:2319
+#: build/trans_presets.java:2325 build/trans_presets.java:2333
+#: build/trans_presets.java:2339 build/trans_presets.java:2344
+#: build/trans_presets.java:2451 build/trans_presets.java:2455
+#: build/trans_presets.java:2459 build/trans_presets.java:2584
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2599 build/trans_presets.java:2621
+#: build/trans_presets.java:2625 build/trans_presets.java:2632
+#: build/trans_presets.java:2636 build/trans_presets.java:2656
+#: build/trans_presets.java:2660 build/trans_presets.java:2667
+#: build/trans_presets.java:2671 build/trans_presets.java:2692
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2707 build/trans_presets.java:2729
+#: build/trans_presets.java:2733 build/trans_presets.java:2740
+#: build/trans_presets.java:2744 build/trans_presets.java:2764
+#: build/trans_presets.java:2768 build/trans_presets.java:2775
+#: build/trans_presets.java:2779 build/trans_presets.java:2800
+#: build/trans_presets.java:2804 build/trans_presets.java:2811
+#: build/trans_presets.java:2815 build/trans_presets.java:2821
+#: build/trans_presets.java:2845 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2860
+#: build/trans_presets.java:2909 build/trans_presets.java:2913
+#: build/trans_presets.java:2920 build/trans_presets.java:2924
+#: build/trans_presets.java:2970 build/trans_presets.java:2974
+#: build/trans_presets.java:2981 build/trans_presets.java:2985
+#: build/trans_presets.java:3009 build/trans_presets.java:3013
+#: build/trans_presets.java:3020 build/trans_presets.java:3024
+#: build/trans_presets.java:3052 build/trans_presets.java:3056
+#: build/trans_presets.java:3063 build/trans_presets.java:3067
+#: build/trans_presets.java:3093 build/trans_presets.java:3097
+#: build/trans_presets.java:3104 build/trans_presets.java:3108
+#: build/trans_presets.java:3131 build/trans_presets.java:3135
+#: build/trans_presets.java:3142 build/trans_presets.java:3146
+#: build/trans_presets.java:3170 build/trans_presets.java:3174
+#: build/trans_presets.java:3181 build/trans_presets.java:3185
+#: build/trans_presets.java:3209 build/trans_presets.java:3213
+#: build/trans_presets.java:3312 build/trans_presets.java:3325
+#: build/trans_presets.java:3415 build/trans_presets.java:3663
+#: build/trans_presets.java:3733 build/trans_presets.java:3736
+#: build/trans_presets.java:3812 build/trans_presets.java:3848
+#: build/trans_presets.java:3853 build/trans_presets.java:3858
+#: build/trans_presets.java:4698 build/trans_presets.java:4811
+#: build/trans_presets.java:4816
 msgid "no"
 msgstr "nei"
 
 #. item "Highways/Streets/Road Restrictions" combo "Agricultural"
-#: build/trans_presets.java:412
+#: build/trans_presets.java:581
 msgid "Agricultural"
 msgstr ""
@@ -25259,13 +25428,13 @@
 #. item "Ways/Path" combo "Snowmobile" display value
 #. item "Ways/Path" combo "Motorcar" display value
-#: build/trans_presets.java:412 build/trans_presets.java:413
-#: build/trans_presets.java:414 build/trans_presets.java:415
-#: build/trans_presets.java:416 build/trans_presets.java:417
-#: build/trans_presets.java:418 build/trans_presets.java:419
-#: build/trans_presets.java:420 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:503
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:535
-#: build/trans_presets.java:536 build/trans_presets.java:537
+#: build/trans_presets.java:583 build/trans_presets.java:593
+#: build/trans_presets.java:603 build/trans_presets.java:613
+#: build/trans_presets.java:626 build/trans_presets.java:639
+#: build/trans_presets.java:648 build/trans_presets.java:661
+#: build/trans_presets.java:674 build/trans_presets.java:804
+#: build/trans_presets.java:817 build/trans_presets.java:830
+#: build/trans_presets.java:900 build/trans_presets.java:906
+#: build/trans_presets.java:912 build/trans_presets.java:923
+#: build/trans_presets.java:929 build/trans_presets.java:935
 msgid "designated"
 msgstr ""
@@ -25287,22 +25456,22 @@
 #. item "Ways/Path" combo "Ski" display value
 #. item "Ways/Path" combo "Snowmobile" display value
-#: build/trans_presets.java:413 build/trans_presets.java:414
-#: build/trans_presets.java:415 build/trans_presets.java:416
-#: build/trans_presets.java:417 build/trans_presets.java:418
-#: build/trans_presets.java:419 build/trans_presets.java:420
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:503 build/trans_presets.java:531
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:535 build/trans_presets.java:536
+#: build/trans_presets.java:594 build/trans_presets.java:604
+#: build/trans_presets.java:614 build/trans_presets.java:627
+#: build/trans_presets.java:640 build/trans_presets.java:650
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:805 build/trans_presets.java:818
+#: build/trans_presets.java:831 build/trans_presets.java:901
+#: build/trans_presets.java:907 build/trans_presets.java:913
+#: build/trans_presets.java:924 build/trans_presets.java:930
 msgid "official"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Goods"
-#: build/trans_presets.java:415
+#: build/trans_presets.java:610
 msgid "Goods"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#: build/trans_presets.java:416
+#: build/trans_presets.java:623
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -25319,10 +25488,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:417 build/trans_presets.java:533
-#: build/trans_presets.java:811 build/trans_presets.java:844
-#: build/trans_presets.java:866 build/trans_presets.java:903
-#: build/trans_presets.java:916 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:992
+#: build/trans_presets.java:636 build/trans_presets.java:910
+#: build/trans_presets.java:1356 build/trans_presets.java:1389
+#: build/trans_presets.java:1411 build/trans_presets.java:1452
+#: build/trans_presets.java:1465 build/trans_presets.java:1477
+#: build/trans_presets.java:1489 build/trans_presets.java:1501
+#: build/trans_presets.java:1541
 msgid "Horse"
 msgstr "Hestar"
@@ -25341,11 +25510,11 @@
 #. item "Barriers/Sally Port" check "Motorcycle"
 #. group "Motorcycle"
-#: build/trans_presets.java:418 build/trans_presets.java:502
-#: build/trans_presets.java:812 build/trans_presets.java:830
-#: build/trans_presets.java:845 build/trans_presets.java:867
-#: build/trans_presets.java:904 build/trans_presets.java:917
-#: build/trans_presets.java:929 build/trans_presets.java:941
-#: build/trans_presets.java:953 build/trans_presets.java:993
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:645 build/trans_presets.java:814
+#: build/trans_presets.java:1357 build/trans_presets.java:1375
+#: build/trans_presets.java:1390 build/trans_presets.java:1412
+#: build/trans_presets.java:1453 build/trans_presets.java:1466
+#: build/trans_presets.java:1478 build/trans_presets.java:1490
+#: build/trans_presets.java:1502 build/trans_presets.java:1542
+#: build/trans_presets.java:2279
 msgid "Motorcycle"
 msgstr "Vélhjól"
@@ -25363,20 +25532,20 @@
 #. item "Barriers/Bump Gate" check "Motorcar"
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:419 build/trans_presets.java:503
-#: build/trans_presets.java:537 build/trans_presets.java:831
-#: build/trans_presets.java:846 build/trans_presets.java:868
-#: build/trans_presets.java:905 build/trans_presets.java:918
-#: build/trans_presets.java:930 build/trans_presets.java:942
-#: build/trans_presets.java:954 build/trans_presets.java:994
+#: build/trans_presets.java:658 build/trans_presets.java:827
+#: build/trans_presets.java:933 build/trans_presets.java:1376
+#: build/trans_presets.java:1391 build/trans_presets.java:1413
+#: build/trans_presets.java:1454 build/trans_presets.java:1467
+#: build/trans_presets.java:1479 build/trans_presets.java:1491
+#: build/trans_presets.java:1503 build/trans_presets.java:1543
 msgid "Motorcar"
 msgstr "Bifreið"
 
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#: build/trans_presets.java:420
+#: build/trans_presets.java:671
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
-#: build/trans_presets.java:422
+#: build/trans_presets.java:682
 msgid "Min. speed (km/h)"
 msgstr "Lámarkshraði (km/klst)"
@@ -25384,25 +25553,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
-#: build/trans_presets.java:423 build/trans_presets.java:463
+#: build/trans_presets.java:683 build/trans_presets.java:746
 msgid "Max. weight (tonnes)"
 msgstr "Hámarksþyngt (í tonnum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:684
 msgid "Max. axleload (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:685
 msgid "Max. Height (meters)"
 msgstr "Hámarkshæð (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:426
+#: build/trans_presets.java:686
 msgid "Max. Width (meters)"
 msgstr "Hámarksbreidd (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:427
+#: build/trans_presets.java:687
 msgid "Max. Length (meters)"
 msgstr "Hámarkslengd (í metrum)"
@@ -25410,5 +25579,5 @@
 #. <separator/>
 #. item "Highways/Streets/Roundabout"
-#: build/trans_presets.java:430
+#: build/trans_presets.java:690
 msgid "Roundabout"
 msgstr "Hringtorg"
@@ -25419,5 +25588,5 @@
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
-#: build/trans_presets.java:435
+#: build/trans_presets.java:695
 msgid "Edit Junction"
 msgstr "Breyti hringtorgi"
@@ -25435,5 +25604,5 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:438 build/trans_style.java:418
+#: build/trans_presets.java:699 build/trans_style.java:418
 #: build/trans_style.java:424
 msgid "motorway"
@@ -25441,5 +25610,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:438
+#: build/trans_presets.java:700
 msgid "motorway_link"
 msgstr "tengibraut á hraðbraut"
@@ -25458,5 +25627,5 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:438 build/trans_style.java:430
+#: build/trans_presets.java:701 build/trans_style.java:430
 #: build/trans_style.java:436
 msgid "trunk"
@@ -25464,5 +25633,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:438
+#: build/trans_presets.java:702
 msgid "trunk_link"
 msgstr ""
@@ -25481,5 +25650,5 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:438 build/trans_style.java:442
+#: build/trans_presets.java:703 build/trans_style.java:442
 #: build/trans_style.java:448
 msgid "primary"
@@ -25487,5 +25656,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:438
+#: build/trans_presets.java:704
 msgid "primary_link"
 msgstr ""
@@ -25504,5 +25673,5 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:438 build/trans_style.java:454
+#: build/trans_presets.java:705 build/trans_style.java:454
 #: build/trans_style.java:460
 msgid "secondary"
@@ -25516,10 +25685,10 @@
 #. <condition k="highway" v="tertiary"/>
 #. color tertiary
-#: build/trans_presets.java:438 build/trans_style.java:466
+#: build/trans_presets.java:706 build/trans_style.java:466
 msgid "tertiary"
 msgstr ""
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:438
+#: build/trans_presets.java:707
 msgid "unclassified"
 msgstr "óflokkaður"
@@ -25532,10 +25701,10 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:438 build/trans_style.java:2712
+#: build/trans_presets.java:708 build/trans_style.java:2712
 msgid "residential"
 msgstr "íbúðargata"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:438
+#: build/trans_presets.java:709
 msgid "living_street"
 msgstr "vistgata"
@@ -25570,5 +25739,5 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:438 build/trans_style.java:508
+#: build/trans_presets.java:710 build/trans_style.java:508
 #: build/trans_style.java:3621
 msgid "service"
@@ -25576,5 +25745,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:438
+#: build/trans_presets.java:711
 msgid "bus_guideway"
 msgstr ""
@@ -25598,5 +25767,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:438 build/trans_style.java:693
+#: build/trans_presets.java:712 build/trans_style.java:693
 #: build/trans_style.java:2767 build/trans_style.java:2768
 msgid "construction"
@@ -25608,25 +25777,25 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:733
 msgid "Edit Bridge"
 msgstr "Breyti brú"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:458
+#: build/trans_presets.java:737
 msgid "viaduct"
 msgstr ""
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:458
+#: build/trans_presets.java:738
 msgid "swing"
 msgstr ""
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:458
+#: build/trans_presets.java:739
 msgid "aqueduct"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel" label "Edit Tunnel"
-#: build/trans_presets.java:468
+#: build/trans_presets.java:751
 msgid "Edit Tunnel"
 msgstr "Breyti göngum"
@@ -25634,10 +25803,10 @@
 #. </optional>
 #. group "Ways"
-#: build/trans_presets.java:482
+#: build/trans_presets.java:766
 msgid "Ways"
 msgstr "Vegir"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:483
+#: build/trans_presets.java:767
 msgid "Track"
 msgstr ""
@@ -25646,35 +25815,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:486
+#: build/trans_presets.java:770
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:491
+#: build/trans_presets.java:775
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:491
+#: build/trans_presets.java:776
 msgid "grade1"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:491
+#: build/trans_presets.java:777
 msgid "grade2"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:491
+#: build/trans_presets.java:778
 msgid "grade3"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:491
+#: build/trans_presets.java:779
 msgid "grade4"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:491
+#: build/trans_presets.java:780
 msgid "grade5"
 msgstr ""
@@ -25682,5 +25851,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:493 build/trans_presets.java:523
+#: build/trans_presets.java:791 build/trans_presets.java:882
 msgid "MTB Scale"
 msgstr ""
@@ -25688,5 +25857,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:507
+#: build/trans_presets.java:843
 msgid "Path"
 msgstr ""
@@ -25695,50 +25864,50 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
 #. item "Ways/Path" label "Edit Path"
-#: build/trans_presets.java:510
+#: build/trans_presets.java:846
 msgid "Edit Path"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:515
+#: build/trans_presets.java:851
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:515
+#: build/trans_presets.java:852
 msgid "T1 - hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:515
+#: build/trans_presets.java:853
 msgid "T2 - mountain hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:515
+#: build/trans_presets.java:854
 msgid "T3 - difficult, exposed hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:515
+#: build/trans_presets.java:855
 msgid "T4 - difficult, exposed, steep alpine trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:515
+#: build/trans_presets.java:856
 msgid "T5 - difficult alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:515
+#: build/trans_presets.java:857
 msgid "T6 - hazardous alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description
-#: build/trans_presets.java:516
+#: build/trans_presets.java:859
 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" item "T2 - mountain hiking trail" short description
-#: build/trans_presets.java:517
+#: build/trans_presets.java:860
 msgid ""
 "Trail with continuous line and balanced ascent. Terrain partially steep, "
@@ -25747,5 +25916,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description
-#: build/trans_presets.java:518
+#: build/trans_presets.java:861
 msgid ""
 "exposed sites may be secured with ropes or chains, possible need to use "
@@ -25755,5 +25924,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description
-#: build/trans_presets.java:519
+#: build/trans_presets.java:862
 msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
@@ -25762,5 +25931,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description
-#: build/trans_presets.java:520
+#: build/trans_presets.java:863
 msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
@@ -25769,5 +25938,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T6 - hazardous alpine trail with climbing" short description
-#: build/trans_presets.java:521
+#: build/trans_presets.java:864
 msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
@@ -25776,10 +25945,10 @@
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:524
+#: build/trans_presets.java:885
 msgid "excellent"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:524
+#: build/trans_presets.java:886
 msgid "good"
 msgstr ""
@@ -25787,15 +25956,15 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:524 build/trans_presets.java:2674
+#: build/trans_presets.java:887 build/trans_presets.java:4253
 msgid "intermediate"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:524
+#: build/trans_presets.java:888
 msgid "bad"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:524
+#: build/trans_presets.java:889
 msgid "horrible"
 msgstr ""
@@ -25818,23 +25987,23 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:534 build/trans_presets.java:1769
-#: build/trans_presets.java:1787 build/trans_presets.java:1803
-#: build/trans_presets.java:1820 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1872
-#: build/trans_presets.java:1894 build/trans_presets.java:1917
-#: build/trans_presets.java:1936 build/trans_presets.java:1953
-#: build/trans_presets.java:1972 build/trans_presets.java:1991
-#: build/trans_presets.java:2007 build/trans_presets.java:2024
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:916 build/trans_presets.java:2597
+#: build/trans_presets.java:2634 build/trans_presets.java:2669
+#: build/trans_presets.java:2705 build/trans_presets.java:2742
+#: build/trans_presets.java:2777 build/trans_presets.java:2813
+#: build/trans_presets.java:2858 build/trans_presets.java:2922
+#: build/trans_presets.java:2983 build/trans_presets.java:3022
+#: build/trans_presets.java:3065 build/trans_presets.java:3106
+#: build/trans_presets.java:3144 build/trans_presets.java:3183
+#: build/trans_presets.java:3211
 msgid "Wheelchairs"
 msgstr ""
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:535
+#: build/trans_presets.java:921
 msgid "Ski"
 msgstr ""
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:536
+#: build/trans_presets.java:927
 msgid "Snowmobile"
 msgstr ""
@@ -25843,5 +26012,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:544
+#: build/trans_presets.java:945
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -25849,5 +26018,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
 #. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
-#: build/trans_presets.java:546
+#: build/trans_presets.java:947
 msgid "Edit Bridleway"
 msgstr "Breyti reiðstíg"
@@ -25855,5 +26024,5 @@
 #. </optional>
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:563
+#: build/trans_presets.java:981
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -25871,11 +26040,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:611
+#: build/trans_presets.java:985 build/trans_presets.java:1027
+#: build/trans_presets.java:1067
 msgid "Edit Cycleway"
 msgstr "Breyti hjólastíg"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:579
+#: build/trans_presets.java:1013
 msgid "Pedestrians"
 msgstr ""
@@ -25883,5 +26052,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:584
+#: build/trans_presets.java:1023
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -25889,5 +26058,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:607
+#: build/trans_presets.java:1063
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -25895,5 +26064,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:1104
 msgid "Dedicated Footway"
 msgstr ""
@@ -25902,5 +26071,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:634
+#: build/trans_presets.java:1107
 msgid "Edit Footway"
 msgstr "Breyti göngustíg"
@@ -25908,5 +26077,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:1140
 msgid "Steps"
 msgstr "Stigi"
@@ -25916,15 +26085,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:654
+#: build/trans_presets.java:1144
 msgid "Edit Flight of Steps"
 msgstr "Breyti stiga"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:668
+#: build/trans_presets.java:1175
 msgid "Amount of Steps"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:673
+#: build/trans_presets.java:1180
 msgid "Motorway Junction"
 msgstr ""
@@ -25932,10 +26101,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:675
+#: build/trans_presets.java:1182
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:681
+#: build/trans_presets.java:1188
 msgid "Services"
 msgstr "Vegþjónustur"
@@ -25943,5 +26112,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:683
+#: build/trans_presets.java:1190
 msgid "Edit Service Station"
 msgstr "Breyti vegþjónustu"
@@ -26031,47 +26200,54 @@
 #. item "Relations/Route" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:688 build/trans_presets.java:855
-#: build/trans_presets.java:1433 build/trans_presets.java:1457
-#: build/trans_presets.java:1466 build/trans_presets.java:1475
-#: build/trans_presets.java:1482 build/trans_presets.java:1490
-#: build/trans_presets.java:1506 build/trans_presets.java:1515
-#: build/trans_presets.java:1534 build/trans_presets.java:1666
-#: build/trans_presets.java:1763 build/trans_presets.java:1781
-#: build/trans_presets.java:1832 build/trans_presets.java:1849
-#: build/trans_presets.java:1908 build/trans_presets.java:1929
-#: build/trans_presets.java:1965 build/trans_presets.java:1984
-#: build/trans_presets.java:2116 build/trans_presets.java:2126
-#: build/trans_presets.java:2176 build/trans_presets.java:2261
-#: build/trans_presets.java:2286 build/trans_presets.java:2329
-#: build/trans_presets.java:2362 build/trans_presets.java:2394
-#: build/trans_presets.java:2407 build/trans_presets.java:2418
-#: build/trans_presets.java:2437 build/trans_presets.java:2446
-#: build/trans_presets.java:2453 build/trans_presets.java:2746
-#: build/trans_presets.java:2755 build/trans_presets.java:2877
-#: build/trans_presets.java:2896 build/trans_presets.java:2915
-#: build/trans_presets.java:2933 build/trans_presets.java:2944
-#: build/trans_presets.java:2960 build/trans_presets.java:3016
-#: build/trans_presets.java:3051 build/trans_presets.java:3059
-#: build/trans_presets.java:3067 build/trans_presets.java:3092
-#: build/trans_presets.java:3207 build/trans_presets.java:3216
-#: build/trans_presets.java:3233 build/trans_presets.java:3242
-#: build/trans_presets.java:3279 build/trans_presets.java:3328
-#: build/trans_presets.java:3351 build/trans_presets.java:3360
-#: build/trans_presets.java:3382 build/trans_presets.java:3397
-#: build/trans_presets.java:3407 build/trans_presets.java:3416
-#: build/trans_presets.java:3444 build/trans_presets.java:3453
-#: build/trans_presets.java:3492 build/trans_presets.java:3508
-#: build/trans_presets.java:3517 build/trans_presets.java:3526
-#: build/trans_presets.java:3542 build/trans_presets.java:3564
-#: build/trans_presets.java:3579 build/trans_presets.java:3588
-#: build/trans_presets.java:3856 build/trans_presets.java:3949
-#: build/trans_presets.java:4093 build/trans_presets.java:4113
+#: build/trans_presets.java:1195 build/trans_presets.java:1400
+#: build/trans_presets.java:2164 build/trans_presets.java:2197
+#: build/trans_presets.java:2206 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2238
+#: build/trans_presets.java:2258 build/trans_presets.java:2271
+#: build/trans_presets.java:2303 build/trans_presets.java:2478
+#: build/trans_presets.java:2575 build/trans_presets.java:2612
+#: build/trans_presets.java:2720 build/trans_presets.java:2756
+#: build/trans_presets.java:2875 build/trans_presets.java:2937
+#: build/trans_presets.java:3037 build/trans_presets.java:3080
+#: build/trans_presets.java:3308 build/trans_presets.java:3321
+#: build/trans_presets.java:3382 build/trans_presets.java:3523
+#: build/trans_presets.java:3551 build/trans_presets.java:3598
+#: build/trans_presets.java:3631 build/trans_presets.java:3678
+#: build/trans_presets.java:3695 build/trans_presets.java:3706
+#: build/trans_presets.java:3729 build/trans_presets.java:3745
+#: build/trans_presets.java:3752 build/trans_presets.java:4384
+#: build/trans_presets.java:4397 build/trans_presets.java:4607
+#: build/trans_presets.java:4626 build/trans_presets.java:4645
+#: build/trans_presets.java:4676 build/trans_presets.java:4708
+#: build/trans_presets.java:4742 build/trans_presets.java:4800
+#: build/trans_presets.java:4861 build/trans_presets.java:4869
+#: build/trans_presets.java:4877 build/trans_presets.java:4905
+#: build/trans_presets.java:5054 build/trans_presets.java:5067
+#: build/trans_presets.java:5092 build/trans_presets.java:5105
+#: build/trans_presets.java:5162 build/trans_presets.java:5239
+#: build/trans_presets.java:5274 build/trans_presets.java:5287
+#: build/trans_presets.java:5321 build/trans_presets.java:5344
+#: build/trans_presets.java:5354 build/trans_presets.java:5367
+#: build/trans_presets.java:5411 build/trans_presets.java:5424
+#: build/trans_presets.java:5483 build/trans_presets.java:5507
+#: build/trans_presets.java:5520 build/trans_presets.java:5533
+#: build/trans_presets.java:5557 build/trans_presets.java:5591
+#: build/trans_presets.java:5614 build/trans_presets.java:5647
+#: build/trans_presets.java:5923 build/trans_presets.java:6074
+#: build/trans_presets.java:6257 build/trans_presets.java:6282
 msgid "Operator"
 msgstr "Rekstraraðili"
 
-#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. item "Waypoints/Services" check "Toilets"
+#. item "Waypoints/Rest Area" check "Toilets"
+#. item "Facilities/Toilets"
+#: build/trans_presets.java:1196 build/trans_presets.java:1206
+#: build/trans_presets.java:3725
+msgid "Toilets"
+msgstr "Salerni"
+
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:692
+#: build/trans_presets.java:1199
 msgid "Rest Area"
 msgstr ""
@@ -26079,12 +26255,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:694
+#: build/trans_presets.java:1201
 msgid "Edit Rest Area"
 msgstr ""
 
-#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:1209
 msgid "Emergency Phone"
 msgstr "Neyðarsími"
@@ -26094,5 +26269,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:707
+#: build/trans_presets.java:1214
 msgid "Traffic Signal"
 msgstr "Umferðarljós"
@@ -26102,5 +26277,5 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:711
+#: build/trans_presets.java:1218
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -26109,6 +26284,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:711 build/trans_presets.java:733
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1219 build/trans_presets.java:1257
+#: build/trans_presets.java:2025
 msgid "uncontrolled"
 msgstr ""
@@ -26117,6 +26292,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:711 build/trans_presets.java:733
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1220 build/trans_presets.java:1258
+#: build/trans_presets.java:2026
 msgid "traffic_signals"
 msgstr ""
@@ -26125,6 +26300,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:711 build/trans_presets.java:733
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1221 build/trans_presets.java:1259
+#: build/trans_presets.java:2027
 msgid "island"
 msgstr "eyja"
@@ -26133,6 +26308,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:711 build/trans_presets.java:733
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1222 build/trans_presets.java:1260
+#: build/trans_presets.java:2028
 msgid "unmarked"
 msgstr ""
@@ -26141,6 +26316,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:712 build/trans_presets.java:735
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1226 build/trans_presets.java:1265
+#: build/trans_presets.java:2032
 msgid "Cross on horseback"
 msgstr ""
@@ -26149,6 +26324,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:713 build/trans_presets.java:734
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1227 build/trans_presets.java:1264
+#: build/trans_presets.java:2033
 msgid "Cross by bicycle"
 msgstr ""
@@ -26157,11 +26332,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:714 build/trans_presets.java:736
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1228 build/trans_presets.java:1266
+#: build/trans_presets.java:2034
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:1229
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -26169,5 +26344,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:715 build/trans_presets.java:737
+#: build/trans_presets.java:1230 build/trans_presets.java:1268
 msgid "zebra"
 msgstr ""
@@ -26175,5 +26350,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:715 build/trans_presets.java:737
+#: build/trans_presets.java:1231 build/trans_presets.java:1269
 msgid "pelican"
 msgstr ""
@@ -26181,5 +26356,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:715 build/trans_presets.java:737
+#: build/trans_presets.java:1232 build/trans_presets.java:1270
 msgid "toucan"
 msgstr ""
@@ -26187,5 +26362,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:715 build/trans_presets.java:737
+#: build/trans_presets.java:1233 build/trans_presets.java:1271
 msgid "puffin"
 msgstr ""
@@ -26193,5 +26368,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:715 build/trans_presets.java:737
+#: build/trans_presets.java:1234 build/trans_presets.java:1272
 msgid "pegasus"
 msgstr ""
@@ -26199,5 +26374,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:715 build/trans_presets.java:737
+#: build/trans_presets.java:1235 build/trans_presets.java:1273
 msgid "tiger"
 msgstr ""
@@ -26205,5 +26380,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:718
+#: build/trans_presets.java:1239
 msgid "Stop"
 msgstr ""
@@ -26211,5 +26386,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:721
+#: build/trans_presets.java:1242
 msgid "Mini-roundabout"
 msgstr "Smáhringtorg"
@@ -26220,15 +26395,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:726
+#: build/trans_presets.java:1247
 msgid "Direction"
 msgstr "Átt"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:726
+#: build/trans_presets.java:1248
 msgid "clockwise"
 msgstr "réttsælis"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:728
+#: build/trans_presets.java:1251
 msgid "Pedestrian Crossing"
 msgstr "Gangbraut"
@@ -26237,15 +26412,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:731
+#: build/trans_presets.java:1254
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:1267
 msgid "Type name (UK)"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:739
+#: build/trans_presets.java:1276
 msgid "Traffic Calming"
 msgstr ""
@@ -26253,40 +26428,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:741
+#: build/trans_presets.java:1278
 msgid "Edit Traffic Calming"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:742
+#: build/trans_presets.java:1281
 msgid "bump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:742
+#: build/trans_presets.java:1282
 msgid "chicane"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:742
+#: build/trans_presets.java:1283
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:742
+#: build/trans_presets.java:1284
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:742
+#: build/trans_presets.java:1285
 msgid "hump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:742
+#: build/trans_presets.java:1286
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:744
+#: build/trans_presets.java:1289
 msgid "Passing Place"
 msgstr ""
@@ -26294,5 +26469,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:746
+#: build/trans_presets.java:1291
 msgid "Edit Passing Place"
 msgstr ""
@@ -26300,5 +26475,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:1294
 msgid "Turning Circle"
 msgstr "Beygjuhringur"
@@ -26308,5 +26483,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:754
+#: build/trans_presets.java:1299
 msgid "City Limit"
 msgstr "Borgarmörk"
@@ -26314,15 +26489,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:1301
 msgid "Edit City Limit Sign"
 msgstr "Breyti borgarmarkaskilti"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:761
+#: build/trans_presets.java:1306
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:763
+#: build/trans_presets.java:1308
 msgid "Speed Camera"
 msgstr "Hraðamyndavél"
@@ -26332,5 +26507,5 @@
 #. <separator/>
 #. item "Waypoints/Incline"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:1313
 msgid "Incline"
 msgstr ""
@@ -26338,5 +26513,5 @@
 #. <key key="highway" value="incline" />
 #. item "Waypoints/Incline Steep"
-#: build/trans_presets.java:771
+#: build/trans_presets.java:1316
 msgid "Incline Steep"
 msgstr ""
@@ -26344,5 +26519,5 @@
 #. <key key="highway" value="incline_steep" />
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:774
+#: build/trans_presets.java:1319
 msgid "Grit Bin"
 msgstr ""
@@ -26352,10 +26527,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:1324
 msgid "Ford"
 msgstr "Vað"
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:780
+#: build/trans_presets.java:1325
 msgid "Edit Ford"
 msgstr "Breyti vaði"
@@ -26363,5 +26538,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:1332
 msgid "Mountain Pass"
 msgstr "Skarð"
@@ -26369,5 +26544,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:789
+#: build/trans_presets.java:1334
 msgid "Edit Mountain Pass"
 msgstr "Breyti skarði"
@@ -26379,7 +26554,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:794 build/trans_presets.java:1850
-#: build/trans_presets.java:2099 build/trans_presets.java:3722
-#: build/trans_presets.java:3730 build/trans_presets.java:3738
+#: build/trans_presets.java:1339 build/trans_presets.java:2757
+#: build/trans_presets.java:3292 build/trans_presets.java:5781
+#: build/trans_presets.java:5789 build/trans_presets.java:5797
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -26413,18 +26588,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:795 build/trans_presets.java:1033
-#: build/trans_presets.java:1044 build/trans_presets.java:1058
-#: build/trans_presets.java:1073 build/trans_presets.java:1692
-#: build/trans_presets.java:2155 build/trans_presets.java:2215
-#: build/trans_presets.java:3107 build/trans_presets.java:3638
-#: build/trans_presets.java:3645 build/trans_presets.java:3652
-#: build/trans_presets.java:3659 build/trans_presets.java:3666
-#: build/trans_presets.java:3674 build/trans_presets.java:3682
-#: build/trans_presets.java:3690 build/trans_presets.java:3697
-#: build/trans_presets.java:3704 build/trans_presets.java:3713
-#: build/trans_presets.java:3723 build/trans_presets.java:3731
-#: build/trans_presets.java:3739 build/trans_presets.java:3746
-#: build/trans_presets.java:3755 build/trans_presets.java:3763
-#: build/trans_presets.java:4028
+#: build/trans_presets.java:1340 build/trans_presets.java:1586
+#: build/trans_presets.java:1598 build/trans_presets.java:1612
+#: build/trans_presets.java:1627 build/trans_presets.java:2504
+#: build/trans_presets.java:3357 build/trans_presets.java:3440
+#: build/trans_presets.java:4926 build/trans_presets.java:5697
+#: build/trans_presets.java:5704 build/trans_presets.java:5711
+#: build/trans_presets.java:5718 build/trans_presets.java:5725
+#: build/trans_presets.java:5733 build/trans_presets.java:5741
+#: build/trans_presets.java:5749 build/trans_presets.java:5756
+#: build/trans_presets.java:5763 build/trans_presets.java:5772
+#: build/trans_presets.java:5782 build/trans_presets.java:5790
+#: build/trans_presets.java:5798 build/trans_presets.java:5805
+#: build/trans_presets.java:5814 build/trans_presets.java:5822
+#: build/trans_presets.java:6166
 msgid "Wikipedia"
 msgstr ""
@@ -26432,5 +26607,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:1344
 msgid "Barriers"
 msgstr "Tálmar"
@@ -26438,5 +26613,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:802
+#: build/trans_presets.java:1347
 msgid "Bollard"
 msgstr ""
@@ -26444,5 +26619,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:804
+#: build/trans_presets.java:1349
 msgid "Edit Bollard"
 msgstr ""
@@ -26487,16 +26662,16 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:807 build/trans_presets.java:826
-#: build/trans_presets.java:840 build/trans_presets.java:862
-#: build/trans_presets.java:899 build/trans_presets.java:912
-#: build/trans_presets.java:924 build/trans_presets.java:936
-#: build/trans_presets.java:948 build/trans_presets.java:960
-#: build/trans_presets.java:970 build/trans_presets.java:979
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1352 build/trans_presets.java:1371
+#: build/trans_presets.java:1385 build/trans_presets.java:1407
+#: build/trans_presets.java:1448 build/trans_presets.java:1461
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1497 build/trans_presets.java:1509
+#: build/trans_presets.java:1519 build/trans_presets.java:1528
+#: build/trans_presets.java:1537
 msgid "Allowed traffic:"
 msgstr "Leyfileg umferð:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:1359
 msgid "Cycle Barrier"
 msgstr ""
@@ -26505,5 +26680,5 @@
 #. <key key="barrier" value="cycle_barrier" />
 #. item "Barriers/Block"
-#: build/trans_presets.java:818
+#: build/trans_presets.java:1363
 msgid "Block"
 msgstr ""
@@ -26511,5 +26686,5 @@
 #. <key key="barrier" value="block" />
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:1366
 msgid "Cattle Grid"
 msgstr "Rimlahlið"
@@ -26517,10 +26692,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:1368
 msgid "Edit Cattle Grid"
 msgstr "Breyti rimlahliði"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:833
+#: build/trans_presets.java:1378
 msgid "Bus Trap"
 msgstr ""
@@ -26528,15 +26703,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:836
+#: build/trans_presets.java:1381
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:837
+#: build/trans_presets.java:1382
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:848
+#: build/trans_presets.java:1393
 msgid "Toll Booth"
 msgstr "Tollskýli"
@@ -26544,5 +26719,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:850
+#: build/trans_presets.java:1395
 msgid "Edit Toll Booth"
 msgstr "Breyti tollskýli"
@@ -26550,10 +26725,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:858
+#: build/trans_presets.java:1403
 msgid "Border Control"
 msgstr "Landamæraeftirlit"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:1404
 msgid "Edit Border Control"
 msgstr "Breyti landamæraeftirliti"
@@ -26562,5 +26737,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:1418
 msgid "Hedge"
 msgstr "Limgerði"
@@ -26571,25 +26746,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:877 build/trans_presets.java:879
+#: build/trans_presets.java:1422 build/trans_presets.java:1424
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:879
+#: build/trans_presets.java:1425
 msgid "fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:879
+#: build/trans_presets.java:1426
 msgid "wood_fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:879
+#: build/trans_presets.java:1427
 msgid "wire_fence"
 msgstr ""
 
 #. item "Barriers/Wall"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:1430
 msgid "Wall"
 msgstr ""
@@ -26597,5 +26772,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:884
+#: build/trans_presets.java:1433
 msgid "City Wall"
 msgstr "Borgarveggur"
@@ -26604,5 +26779,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:1437
 msgid "Retaining Wall"
 msgstr ""
@@ -26613,15 +26788,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:1444
 msgid "Entrance"
 msgstr "Inngangur"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:1445
 msgid "Edit Entrance"
 msgstr "Breyti inngang"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:1456
 msgid "Gate"
 msgstr "Hlið"
@@ -26629,50 +26804,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:1458
 msgid "Edit Gate"
 msgstr "Breyti hliði"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:1469
 msgid "Lift Gate"
 msgstr "Liftuhlið"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:1470
 msgid "Edit Lift Gate"
 msgstr "Breyti liftuhliði"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:932
+#: build/trans_presets.java:1481
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:1482
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:1493
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:1494
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:956
+#: build/trans_presets.java:1505
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:957
+#: build/trans_presets.java:1506
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:965
+#: build/trans_presets.java:1514
 msgid "Stile"
 msgstr ""
@@ -26680,25 +26855,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:1516
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1524
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1525
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:1533
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:1534
 msgid "Edit Sally Port"
 msgstr ""
@@ -26708,6 +26883,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:999 build/trans_presets.java:1000
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1548 build/trans_presets.java:1549
+#: build/trans_presets.java:1655
 msgid "Water"
 msgstr "Vatn"
@@ -26715,5 +26890,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1551
 msgid "Drain"
 msgstr "Frárennsli"
@@ -26721,10 +26896,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1553
 msgid "Edit Drain"
 msgstr "Breyti frárennsli"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1560
 msgid "Ditch"
 msgstr ""
@@ -26732,10 +26907,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1562
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1569
 msgid "Stream"
 msgstr "Lækur"
@@ -26743,10 +26918,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1020
+#: build/trans_presets.java:1571
 msgid "Edit Stream"
 msgstr "Breyti læk"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1578
 msgid "Canal"
 msgstr "Skipaskurður"
@@ -26754,10 +26929,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:1580
 msgid "Edit Canal"
 msgstr "Breyti skipaskurð"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1588
 msgid "River"
 msgstr "Á"
@@ -26767,5 +26942,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1592
 msgid "Edit River"
 msgstr "Breyti á"
@@ -26773,5 +26948,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1601
 msgid "Spring"
 msgstr "Goshver"
@@ -26779,20 +26954,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1603
 msgid "Edit Spring"
 msgstr "Breyti goshver"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1607
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1608
 msgid "Edit Waterfall"
 msgstr "Breyti fossi"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1060
+#: build/trans_presets.java:1614
 msgid "Weir"
 msgstr ""
@@ -26800,10 +26975,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1616
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1621
 msgid "Dam"
 msgstr "Stífla"
@@ -26811,10 +26986,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1069
+#: build/trans_presets.java:1623
 msgid "Edit Dam"
 msgstr "Breyti stíflu"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1629
 msgid "Groyne"
 msgstr ""
@@ -26822,5 +26997,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1631
 msgid "Edit Groyne"
 msgstr ""
@@ -26830,15 +27005,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1636
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1083
+#: build/trans_presets.java:1637
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1642
 msgid "Reservoir"
 msgstr ""
@@ -26846,15 +27021,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1090
+#: build/trans_presets.java:1644
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1649
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1650
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -26862,20 +27037,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1657
 msgid "Edit Water"
 msgstr "Breyti vatni"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1661
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1662
 msgid "Edit Land"
 msgstr "Breyti landi"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1666
 msgid "Coastline"
 msgstr "Strandlengja"
@@ -26883,10 +27058,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1668
 msgid "Edit Coastline"
 msgstr "Breyti strandlengju"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1118
+#: build/trans_presets.java:1672
 msgid "Riverbank"
 msgstr "Árbakki"
@@ -26895,5 +27070,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1675
 msgid "Edit Riverbank"
 msgstr "Breyti árbakka"
@@ -26901,5 +27076,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1680
 msgid "Wetland"
 msgstr "Votlendi"
@@ -26910,15 +27085,15 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1685
 msgid "Edit Wetland"
 msgstr "Breyti votlendi"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1689
 msgid "swamp"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1690
 msgid "bog"
 msgstr ""
@@ -26931,40 +27106,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1134 build/trans_style.java:2894
+#: build/trans_presets.java:1691 build/trans_style.java:2894
 msgid "marsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1692
 msgid "reedbed"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1693
 msgid "saltmarsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1694
 msgid "tidalflat"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1695
 msgid "mangrove"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1698
 msgid "Mud"
 msgstr "Leðja"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1699
 msgid "Edit Mud"
 msgstr "Breyti leðju"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1703
 msgid "Beach"
 msgstr "Strönd"
@@ -26972,20 +27147,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1705
 msgid "Edit Beach"
 msgstr "Breyti strönd"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1709
 msgid "Bay"
 msgstr "Flói"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1710
 msgid "Edit Bay"
 msgstr "Breyti flóa"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1714
 msgid "Cliff"
 msgstr "Klettur"
@@ -26993,15 +27168,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1716
 msgid "Edit Cliff"
 msgstr "Breyti klett"
 
 #. group "Shipping"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1721
 msgid "Shipping"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1722
 msgid "Ferry Terminal"
 msgstr ""
@@ -27009,20 +27184,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1724
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1165
+#: build/trans_presets.java:1727
 msgid "Cargo"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1165
+#: build/trans_presets.java:1728
 msgid "passengers"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1165
+#: build/trans_presets.java:1729
 msgid "vehicle"
 msgstr ""
@@ -27107,5 +27282,5 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1165 build/trans_presets.java:4086
+#: build/trans_presets.java:1730 build/trans_presets.java:6239
 #: build/trans_style.java:190 build/trans_style.java:520
 #: build/trans_style.java:540 build/trans_style.java:546
@@ -27118,15 +27293,15 @@
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1165
+#: build/trans_presets.java:1731
 msgid "hgv"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1165
+#: build/trans_presets.java:1732
 msgid "passengers;vehicle"
 msgstr ""
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1735
 msgid "Ferry Route"
 msgstr "Siglingarleið ferju"
@@ -27134,5 +27309,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1737
 msgid "Edit Ferry"
 msgstr ""
@@ -27141,15 +27316,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1745
 msgid "Marina"
 msgstr "Smábátahöfn"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1746
 msgid "Edit Marina"
 msgstr "Breyti smábátahöfn"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1182
+#: build/trans_presets.java:1750
 msgid "Pier"
 msgstr "Bryggja"
@@ -27157,10 +27332,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1752
 msgid "Edit Pier"
 msgstr "Breyti bryggju"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1756
 msgid "Lock Gate"
 msgstr ""
@@ -27169,5 +27344,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1760
 msgid "Turning Point"
 msgstr ""
@@ -27177,5 +27352,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1765
 msgid "Slipway"
 msgstr ""
@@ -27185,10 +27360,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1769
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1773
 msgid "Boatyard"
 msgstr ""
@@ -27196,10 +27371,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1775
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1780
 msgid "Dock"
 msgstr "Skipakví"
@@ -27207,20 +27382,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1782
 msgid "Edit Dock"
 msgstr "Breyti skipakví"
 
 #. group "Transport"
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1789
 msgid "Transport"
 msgstr "Samgöngur"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1790
 msgid "Railway"
 msgstr ""
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1791
 msgid "Rail"
 msgstr ""
@@ -27228,5 +27403,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1793
 msgid "Edit Rail"
 msgstr ""
@@ -27256,7 +27431,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1229 build/trans_presets.java:1241
-#: build/trans_presets.java:1265 build/trans_presets.java:1277
-#: build/trans_presets.java:1289 build/trans_presets.java:1301
+#: build/trans_presets.java:1797 build/trans_presets.java:1822
+#: build/trans_presets.java:1871 build/trans_presets.java:1896
+#: build/trans_presets.java:1921 build/trans_presets.java:1946
 msgid "Gauge (mm)"
 msgstr ""
@@ -27272,8 +27447,8 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1230 build/trans_presets.java:1242
-#: build/trans_presets.java:1254 build/trans_presets.java:1266
-#: build/trans_presets.java:1278 build/trans_presets.java:1290
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1799 build/trans_presets.java:1824
+#: build/trans_presets.java:1848 build/trans_presets.java:1873
+#: build/trans_presets.java:1898 build/trans_presets.java:1923
+#: build/trans_presets.java:1948
 msgid "Types"
 msgstr ""
@@ -27287,8 +27462,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1230 build/trans_presets.java:1242
-#: build/trans_presets.java:1254 build/trans_presets.java:1266
-#: build/trans_presets.java:1278 build/trans_presets.java:1290
-#: build/trans_presets.java:1302 build/trans_presets.java:1331
+#: build/trans_presets.java:1800 build/trans_presets.java:1825
+#: build/trans_presets.java:1849 build/trans_presets.java:1874
+#: build/trans_presets.java:1899 build/trans_presets.java:1924
+#: build/trans_presets.java:1949 build/trans_presets.java:2007
 msgid "yard"
 msgstr ""
@@ -27302,8 +27477,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1230 build/trans_presets.java:1242
-#: build/trans_presets.java:1254 build/trans_presets.java:1266
-#: build/trans_presets.java:1278 build/trans_presets.java:1290
-#: build/trans_presets.java:1302 build/trans_presets.java:1331
+#: build/trans_presets.java:1801 build/trans_presets.java:1826
+#: build/trans_presets.java:1850 build/trans_presets.java:1875
+#: build/trans_presets.java:1900 build/trans_presets.java:1925
+#: build/trans_presets.java:1950 build/trans_presets.java:2008
 msgid "siding"
 msgstr ""
@@ -27317,8 +27492,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1230 build/trans_presets.java:1242
-#: build/trans_presets.java:1254 build/trans_presets.java:1266
-#: build/trans_presets.java:1278 build/trans_presets.java:1290
-#: build/trans_presets.java:1302 build/trans_presets.java:1331
+#: build/trans_presets.java:1802 build/trans_presets.java:1827
+#: build/trans_presets.java:1851 build/trans_presets.java:1876
+#: build/trans_presets.java:1901 build/trans_presets.java:1926
+#: build/trans_presets.java:1951 build/trans_presets.java:2009
 msgid "spur"
 msgstr ""
@@ -27331,8 +27506,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1231 build/trans_presets.java:1243
-#: build/trans_presets.java:1255 build/trans_presets.java:1267
-#: build/trans_presets.java:1279 build/trans_presets.java:1291
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1804 build/trans_presets.java:1829
+#: build/trans_presets.java:1853 build/trans_presets.java:1878
+#: build/trans_presets.java:1903 build/trans_presets.java:1928
+#: build/trans_presets.java:1953
 msgid "Electrified"
 msgstr ""
@@ -27345,8 +27520,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: build/trans_presets.java:1231 build/trans_presets.java:1243
-#: build/trans_presets.java:1255 build/trans_presets.java:1267
-#: build/trans_presets.java:1279 build/trans_presets.java:1291
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1805 build/trans_presets.java:1830
+#: build/trans_presets.java:1854 build/trans_presets.java:1879
+#: build/trans_presets.java:1904 build/trans_presets.java:1929
+#: build/trans_presets.java:1954
 msgid "contact_line"
 msgstr ""
@@ -27407,8 +27582,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1231 build/trans_presets.java:1243
-#: build/trans_presets.java:1255 build/trans_presets.java:1267
-#: build/trans_presets.java:1279 build/trans_presets.java:1291
-#: build/trans_presets.java:1303 build/trans_style.java:590
+#: build/trans_presets.java:1808 build/trans_presets.java:1833
+#: build/trans_presets.java:1857 build/trans_presets.java:1882
+#: build/trans_presets.java:1907 build/trans_presets.java:1932
+#: build/trans_presets.java:1957 build/trans_style.java:590
 #: build/trans_style.java:953 build/trans_style.java:1003
 #: build/trans_style.java:1009 build/trans_style.java:1016
@@ -27428,9 +27603,9 @@
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Power/Power Line" combo "Voltage"
-#: build/trans_presets.java:1232 build/trans_presets.java:1244
-#: build/trans_presets.java:1256 build/trans_presets.java:1268
-#: build/trans_presets.java:1280 build/trans_presets.java:1292
-#: build/trans_presets.java:1304 build/trans_presets.java:1458
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:1810 build/trans_presets.java:1835
+#: build/trans_presets.java:1859 build/trans_presets.java:1884
+#: build/trans_presets.java:1909 build/trans_presets.java:1934
+#: build/trans_presets.java:1959 build/trans_presets.java:2198
+#: build/trans_presets.java:4908
 msgid "Voltage"
 msgstr "Volt"
@@ -27443,8 +27618,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1233 build/trans_presets.java:1245
-#: build/trans_presets.java:1257 build/trans_presets.java:1269
-#: build/trans_presets.java:1281 build/trans_presets.java:1293
-#: build/trans_presets.java:1305
+#: build/trans_presets.java:1812 build/trans_presets.java:1837
+#: build/trans_presets.java:1861 build/trans_presets.java:1886
+#: build/trans_presets.java:1911 build/trans_presets.java:1936
+#: build/trans_presets.java:1961
 msgid "Frequency (Hz)"
 msgstr ""
@@ -27457,8 +27632,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: build/trans_presets.java:1233 build/trans_presets.java:1245
-#: build/trans_presets.java:1257 build/trans_presets.java:1269
-#: build/trans_presets.java:1281 build/trans_presets.java:1293
-#: build/trans_presets.java:1305
+#: build/trans_presets.java:1813 build/trans_presets.java:1838
+#: build/trans_presets.java:1862 build/trans_presets.java:1887
+#: build/trans_presets.java:1912 build/trans_presets.java:1937
+#: build/trans_presets.java:1962
 msgid "16.7"
 msgstr ""
@@ -27466,10 +27641,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1817
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1818
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
@@ -27477,5 +27652,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1842
 msgid "Monorail"
 msgstr ""
@@ -27483,5 +27658,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1844
 msgid "Edit Monorail"
 msgstr ""
@@ -27489,10 +27664,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1866
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1867
 msgid "Edit Preserved Railway"
 msgstr ""
@@ -27500,10 +27675,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1891
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1892
 msgid "Edit Light Rail"
 msgstr ""
@@ -27511,10 +27686,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1916
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1285
+#: build/trans_presets.java:1917
 msgid "Edit Subway"
 msgstr ""
@@ -27522,10 +27697,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1941
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1942
 msgid "Edit Tram"
 msgstr ""
@@ -27533,5 +27708,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1966
 msgid "Bus Guideway"
 msgstr ""
@@ -27539,5 +27714,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1968
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -27546,10 +27721,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:2002
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:2003
 msgid "Edit Disused Railway"
 msgstr ""
@@ -27558,10 +27733,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:2006
 msgid "Optional Types"
 msgstr ""
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:2012
 msgid "Abandoned Rail"
 msgstr ""
@@ -27570,5 +27745,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:2016
 msgid "Level Crossing"
 msgstr ""
@@ -27577,5 +27752,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:2020
 msgid "Crossing"
 msgstr ""
@@ -27585,5 +27760,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:2024
 msgid "Crossing type"
 msgstr ""
@@ -27591,5 +27766,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:2037
 msgid "Turntable"
 msgstr ""
@@ -27598,5 +27773,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:2041
 msgid "Buffer Stop"
 msgstr ""
@@ -27605,10 +27780,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:2046
 msgid "Aerialway"
 msgstr "Skíðalyfta"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:2047
 msgid "Chair Lift"
 msgstr "Stólalyfta"
@@ -27616,10 +27791,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:2049
 msgid "Edit Chair Lift"
 msgstr "Breyti stólalyftu"
 
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1367
+#: build/trans_presets.java:2053
 msgid "Drag Lift"
 msgstr "Toglyfta"
@@ -27627,10 +27802,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:2055
 msgid "Edit Drag Lift"
 msgstr "Breyti toglyftu"
 
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:2059
 msgid "Cable Car"
 msgstr "Kláfur"
@@ -27638,10 +27813,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:2061
 msgid "Edit Cable Car"
 msgstr "Breyti kláf"
 
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:2065
 msgid "Gondola"
 msgstr ""
@@ -27649,5 +27824,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:2067
 msgid "Edit Gondola"
 msgstr ""
@@ -27655,5 +27830,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:2072
 msgctxt "aerialway"
 msgid "Station"
@@ -27662,5 +27837,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:2074
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -27668,5 +27843,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:2078
 msgctxt "aerialway"
 msgid "Pylon"
@@ -27675,5 +27850,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:2080
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -27681,5 +27856,5 @@
 
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:2084
 msgctxt "aerialway"
 msgid "Goods"
@@ -27687,5 +27862,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:2085
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -27703,6 +27878,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1406 build/trans_presets.java:1520
-#: build/trans_presets.java:1552 build/trans_surveyor.java:24
+#: build/trans_presets.java:2092 build/trans_presets.java:2280
+#: build/trans_presets.java:2355 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Stæði"
@@ -27711,5 +27886,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:2095
 msgid "Edit Parking"
 msgstr "Breyti stæði"
@@ -27720,7 +27895,7 @@
 #. item "Facilities/Toilets" text "Reference number"
 #. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1412 build/trans_presets.java:2117
-#: build/trans_presets.java:2127 build/trans_presets.java:2438
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:2098 build/trans_presets.java:3309
+#: build/trans_presets.java:3322 build/trans_presets.java:3730
+#: build/trans_presets.java:5648
 msgid "Reference number"
 msgstr "Tilvísun"
@@ -27728,5 +27903,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1413 build/trans_presets.java:1525
+#: build/trans_presets.java:2100 build/trans_presets.java:2286
 msgid "multi-storey"
 msgstr ""
@@ -27734,5 +27909,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1413 build/trans_presets.java:1525
+#: build/trans_presets.java:2101 build/trans_presets.java:2287
 msgid "surface"
 msgstr "slitlag"
@@ -27740,10 +27915,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1413 build/trans_presets.java:1525
+#: build/trans_presets.java:2102 build/trans_presets.java:2288
 msgid "underground"
 msgstr ""
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:2104
 msgid "Park and Ride"
 msgstr ""
@@ -27754,7 +27929,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1415 build/trans_presets.java:1526
-#: build/trans_presets.java:2118 build/trans_presets.java:2128
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2108 build/trans_presets.java:2290
+#: build/trans_presets.java:3310 build/trans_presets.java:3323
+#: build/trans_presets.java:3731
 msgid "Fee"
 msgstr ""
@@ -27762,25 +27937,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:2113
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1418
+#: build/trans_presets.java:2114
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:2119
 msgid "Spaces for Women"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:2124
 msgid "Spaces for Parents"
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1421
+#: build/trans_presets.java:2129
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
@@ -27788,5 +27963,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:2132
 msgid "Fuel"
 msgstr "Bensínstöð"
@@ -27796,5 +27971,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:2136
 msgid "Edit Fuel"
 msgstr "Breyti bensínstöð"
@@ -27808,118 +27983,118 @@
 #. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1430 build/trans_presets.java:1465
-#: build/trans_presets.java:1481 build/trans_presets.java:1489
-#: build/trans_presets.java:1505 build/trans_presets.java:1514
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:2138 build/trans_presets.java:2205
+#: build/trans_presets.java:2225 build/trans_presets.java:2237
+#: build/trans_presets.java:2257 build/trans_presets.java:2270
+#: build/trans_presets.java:2300
 msgid "Brand"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2139
 msgid "Agip"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2140
 msgid "Aral"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2141
 msgid "Avia"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2142
 msgid "BP"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2143
 msgid "Chevron"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2144
 msgid "Citgo"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2145
 msgid "Esso"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2146
 msgid "Exxon"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2147
 msgid "Gulf"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2148
 msgid "Mobil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2149
 msgid "OMV"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2150
 msgid "Petro-Canada"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2151
 msgid "Pioneer"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2152
 msgid "Q8"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2153
 msgid "Repsol"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2154
 msgid "Shell"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2155
 msgid "Sunoco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2156
 msgid "Statoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2157
 msgid "Tamoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2158
 msgid "Texaco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2159
 msgid "Total"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:2160
 msgid "Independent"
 msgstr ""
@@ -28012,48 +28187,48 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1434 build/trans_presets.java:1467
-#: build/trans_presets.java:1483 build/trans_presets.java:1491
-#: build/trans_presets.java:1507 build/trans_presets.java:1516
-#: build/trans_presets.java:1535 build/trans_presets.java:1911
-#: build/trans_presets.java:1931 build/trans_presets.java:1948
-#: build/trans_presets.java:1967 build/trans_presets.java:1986
-#: build/trans_presets.java:2002 build/trans_presets.java:2019
-#: build/trans_presets.java:2036 build/trans_presets.java:2052
-#: build/trans_presets.java:2067 build/trans_presets.java:2154
-#: build/trans_presets.java:2161 build/trans_presets.java:2177
-#: build/trans_presets.java:2214 build/trans_presets.java:2230
-#: build/trans_presets.java:2253 build/trans_presets.java:2287
-#: build/trans_presets.java:2372 build/trans_presets.java:2378
-#: build/trans_presets.java:2386 build/trans_presets.java:2395
-#: build/trans_presets.java:2408 build/trans_presets.java:2429
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:3113 build/trans_presets.java:3121
-#: build/trans_presets.java:3170 build/trans_presets.java:3177
-#: build/trans_presets.java:3184 build/trans_presets.java:3192
-#: build/trans_presets.java:3199 build/trans_presets.java:3208
-#: build/trans_presets.java:3217 build/trans_presets.java:3224
-#: build/trans_presets.java:3234 build/trans_presets.java:3243
-#: build/trans_presets.java:3249 build/trans_presets.java:3257
-#: build/trans_presets.java:3263 build/trans_presets.java:3271
-#: build/trans_presets.java:3280 build/trans_presets.java:3286
-#: build/trans_presets.java:3293 build/trans_presets.java:3299
-#: build/trans_presets.java:3307 build/trans_presets.java:3314
-#: build/trans_presets.java:3320 build/trans_presets.java:3329
-#: build/trans_presets.java:3337 build/trans_presets.java:3343
-#: build/trans_presets.java:3352 build/trans_presets.java:3361
-#: build/trans_presets.java:3367 build/trans_presets.java:3373
-#: build/trans_presets.java:3383 build/trans_presets.java:3391
-#: build/trans_presets.java:3408 build/trans_presets.java:3417
-#: build/trans_presets.java:3424 build/trans_presets.java:3430
-#: build/trans_presets.java:3436 build/trans_presets.java:3445
-#: build/trans_presets.java:3454 build/trans_presets.java:3462
-#: build/trans_presets.java:3469 build/trans_presets.java:3477
-#: build/trans_presets.java:3484 build/trans_presets.java:3493
-#: build/trans_presets.java:3500 build/trans_presets.java:3509
-#: build/trans_presets.java:3518 build/trans_presets.java:3527
-#: build/trans_presets.java:3534 build/trans_presets.java:3543
-#: build/trans_presets.java:3549 build/trans_presets.java:3556
-#: build/trans_presets.java:3565 build/trans_presets.java:3571
-#: build/trans_presets.java:3580
+#: build/trans_presets.java:2165 build/trans_presets.java:2207
+#: build/trans_presets.java:2227 build/trans_presets.java:2239
+#: build/trans_presets.java:2259 build/trans_presets.java:2272
+#: build/trans_presets.java:2304 build/trans_presets.java:2896
+#: build/trans_presets.java:2959 build/trans_presets.java:2998
+#: build/trans_presets.java:3041 build/trans_presets.java:3082
+#: build/trans_presets.java:3120 build/trans_presets.java:3159
+#: build/trans_presets.java:3198 build/trans_presets.java:3227
+#: build/trans_presets.java:3242 build/trans_presets.java:3352
+#: build/trans_presets.java:3363 build/trans_presets.java:3383
+#: build/trans_presets.java:3435 build/trans_presets.java:3455
+#: build/trans_presets.java:3511 build/trans_presets.java:3552
+#: build/trans_presets.java:3641 build/trans_presets.java:3651
+#: build/trans_presets.java:3666 build/trans_presets.java:3679
+#: build/trans_presets.java:3696 build/trans_presets.java:3717
+#: build/trans_presets.java:4068 build/trans_presets.java:4078
+#: build/trans_presets.java:4932 build/trans_presets.java:4944
+#: build/trans_presets.java:4997 build/trans_presets.java:5008
+#: build/trans_presets.java:5019 build/trans_presets.java:5031
+#: build/trans_presets.java:5042 build/trans_presets.java:5055
+#: build/trans_presets.java:5068 build/trans_presets.java:5079
+#: build/trans_presets.java:5093 build/trans_presets.java:5106
+#: build/trans_presets.java:5116 build/trans_presets.java:5128
+#: build/trans_presets.java:5138 build/trans_presets.java:5150
+#: build/trans_presets.java:5163 build/trans_presets.java:5173
+#: build/trans_presets.java:5184 build/trans_presets.java:5194
+#: build/trans_presets.java:5206 build/trans_presets.java:5217
+#: build/trans_presets.java:5227 build/trans_presets.java:5240
+#: build/trans_presets.java:5252 build/trans_presets.java:5262
+#: build/trans_presets.java:5275 build/trans_presets.java:5288
+#: build/trans_presets.java:5298 build/trans_presets.java:5308
+#: build/trans_presets.java:5322 build/trans_presets.java:5334
+#: build/trans_presets.java:5355 build/trans_presets.java:5368
+#: build/trans_presets.java:5379 build/trans_presets.java:5389
+#: build/trans_presets.java:5399 build/trans_presets.java:5412
+#: build/trans_presets.java:5425 build/trans_presets.java:5437
+#: build/trans_presets.java:5448 build/trans_presets.java:5460
+#: build/trans_presets.java:5471 build/trans_presets.java:5484
+#: build/trans_presets.java:5495 build/trans_presets.java:5508
+#: build/trans_presets.java:5521 build/trans_presets.java:5534
+#: build/trans_presets.java:5545 build/trans_presets.java:5558
+#: build/trans_presets.java:5568 build/trans_presets.java:5579
+#: build/trans_presets.java:5592 build/trans_presets.java:5602
+#: build/trans_presets.java:5615
 msgid "Opening Hours"
 msgstr "Opnunartími"
@@ -28143,46 +28318,46 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1434 build/trans_presets.java:1467
-#: build/trans_presets.java:1483 build/trans_presets.java:1491
-#: build/trans_presets.java:1507 build/trans_presets.java:1516
-#: build/trans_presets.java:1535 build/trans_presets.java:1911
-#: build/trans_presets.java:1931 build/trans_presets.java:1948
-#: build/trans_presets.java:1967 build/trans_presets.java:1986
-#: build/trans_presets.java:2002 build/trans_presets.java:2019
-#: build/trans_presets.java:2036 build/trans_presets.java:2067
-#: build/trans_presets.java:2154 build/trans_presets.java:2161
-#: build/trans_presets.java:2214 build/trans_presets.java:2230
-#: build/trans_presets.java:2253 build/trans_presets.java:2287
-#: build/trans_presets.java:2372 build/trans_presets.java:2378
-#: build/trans_presets.java:2386 build/trans_presets.java:2395
-#: build/trans_presets.java:2429 build/trans_presets.java:2574
-#: build/trans_presets.java:2580 build/trans_presets.java:3113
-#: build/trans_presets.java:3121 build/trans_presets.java:3170
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3192 build/trans_presets.java:3199
-#: build/trans_presets.java:3208 build/trans_presets.java:3217
-#: build/trans_presets.java:3224 build/trans_presets.java:3234
-#: build/trans_presets.java:3243 build/trans_presets.java:3249
-#: build/trans_presets.java:3257 build/trans_presets.java:3263
-#: build/trans_presets.java:3271 build/trans_presets.java:3280
-#: build/trans_presets.java:3286 build/trans_presets.java:3293
-#: build/trans_presets.java:3299 build/trans_presets.java:3307
-#: build/trans_presets.java:3314 build/trans_presets.java:3320
-#: build/trans_presets.java:3329 build/trans_presets.java:3337
-#: build/trans_presets.java:3343 build/trans_presets.java:3352
-#: build/trans_presets.java:3361 build/trans_presets.java:3367
-#: build/trans_presets.java:3373 build/trans_presets.java:3383
-#: build/trans_presets.java:3391 build/trans_presets.java:3408
-#: build/trans_presets.java:3417 build/trans_presets.java:3424
-#: build/trans_presets.java:3430 build/trans_presets.java:3436
-#: build/trans_presets.java:3445 build/trans_presets.java:3454
-#: build/trans_presets.java:3462 build/trans_presets.java:3469
-#: build/trans_presets.java:3477 build/trans_presets.java:3484
-#: build/trans_presets.java:3493 build/trans_presets.java:3500
-#: build/trans_presets.java:3509 build/trans_presets.java:3518
-#: build/trans_presets.java:3527 build/trans_presets.java:3534
-#: build/trans_presets.java:3543 build/trans_presets.java:3549
-#: build/trans_presets.java:3556 build/trans_presets.java:3565
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
+#: build/trans_presets.java:2166 build/trans_presets.java:2208
+#: build/trans_presets.java:2228 build/trans_presets.java:2240
+#: build/trans_presets.java:2260 build/trans_presets.java:2273
+#: build/trans_presets.java:2305 build/trans_presets.java:2897
+#: build/trans_presets.java:2960 build/trans_presets.java:2999
+#: build/trans_presets.java:3042 build/trans_presets.java:3083
+#: build/trans_presets.java:3121 build/trans_presets.java:3160
+#: build/trans_presets.java:3199 build/trans_presets.java:3243
+#: build/trans_presets.java:3353 build/trans_presets.java:3364
+#: build/trans_presets.java:3436 build/trans_presets.java:3456
+#: build/trans_presets.java:3512 build/trans_presets.java:3553
+#: build/trans_presets.java:3642 build/trans_presets.java:3652
+#: build/trans_presets.java:3667 build/trans_presets.java:3680
+#: build/trans_presets.java:3718 build/trans_presets.java:4069
+#: build/trans_presets.java:4079 build/trans_presets.java:4933
+#: build/trans_presets.java:4945 build/trans_presets.java:4998
+#: build/trans_presets.java:5009 build/trans_presets.java:5020
+#: build/trans_presets.java:5032 build/trans_presets.java:5043
+#: build/trans_presets.java:5056 build/trans_presets.java:5069
+#: build/trans_presets.java:5080 build/trans_presets.java:5094
+#: build/trans_presets.java:5107 build/trans_presets.java:5117
+#: build/trans_presets.java:5129 build/trans_presets.java:5139
+#: build/trans_presets.java:5151 build/trans_presets.java:5164
+#: build/trans_presets.java:5174 build/trans_presets.java:5185
+#: build/trans_presets.java:5195 build/trans_presets.java:5207
+#: build/trans_presets.java:5218 build/trans_presets.java:5228
+#: build/trans_presets.java:5241 build/trans_presets.java:5253
+#: build/trans_presets.java:5263 build/trans_presets.java:5276
+#: build/trans_presets.java:5289 build/trans_presets.java:5299
+#: build/trans_presets.java:5309 build/trans_presets.java:5323
+#: build/trans_presets.java:5335 build/trans_presets.java:5356
+#: build/trans_presets.java:5369 build/trans_presets.java:5380
+#: build/trans_presets.java:5390 build/trans_presets.java:5400
+#: build/trans_presets.java:5413 build/trans_presets.java:5426
+#: build/trans_presets.java:5438 build/trans_presets.java:5449
+#: build/trans_presets.java:5461 build/trans_presets.java:5472
+#: build/trans_presets.java:5485 build/trans_presets.java:5496
+#: build/trans_presets.java:5509 build/trans_presets.java:5522
+#: build/trans_presets.java:5535 build/trans_presets.java:5546
+#: build/trans_presets.java:5559 build/trans_presets.java:5569
+#: build/trans_presets.java:5580 build/trans_presets.java:5593
+#: build/trans_presets.java:5603 build/trans_presets.java:5616
 msgid "24/7"
 msgstr ""
@@ -28273,47 +28448,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1434 build/trans_presets.java:1467
-#: build/trans_presets.java:1483 build/trans_presets.java:1491
-#: build/trans_presets.java:1507 build/trans_presets.java:1516
-#: build/trans_presets.java:1535 build/trans_presets.java:1911
-#: build/trans_presets.java:1931 build/trans_presets.java:1948
-#: build/trans_presets.java:1967 build/trans_presets.java:1986
-#: build/trans_presets.java:2002 build/trans_presets.java:2019
-#: build/trans_presets.java:2036 build/trans_presets.java:2067
-#: build/trans_presets.java:2154 build/trans_presets.java:2161
-#: build/trans_presets.java:2177 build/trans_presets.java:2214
-#: build/trans_presets.java:2230 build/trans_presets.java:2253
-#: build/trans_presets.java:2287 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2386
-#: build/trans_presets.java:2395 build/trans_presets.java:2429
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:3113 build/trans_presets.java:3121
-#: build/trans_presets.java:3170 build/trans_presets.java:3177
-#: build/trans_presets.java:3184 build/trans_presets.java:3192
-#: build/trans_presets.java:3199 build/trans_presets.java:3208
-#: build/trans_presets.java:3217 build/trans_presets.java:3224
-#: build/trans_presets.java:3234 build/trans_presets.java:3243
-#: build/trans_presets.java:3249 build/trans_presets.java:3257
-#: build/trans_presets.java:3263 build/trans_presets.java:3271
-#: build/trans_presets.java:3280 build/trans_presets.java:3286
-#: build/trans_presets.java:3293 build/trans_presets.java:3299
-#: build/trans_presets.java:3307 build/trans_presets.java:3314
-#: build/trans_presets.java:3320 build/trans_presets.java:3329
-#: build/trans_presets.java:3337 build/trans_presets.java:3343
-#: build/trans_presets.java:3352 build/trans_presets.java:3361
-#: build/trans_presets.java:3367 build/trans_presets.java:3373
-#: build/trans_presets.java:3383 build/trans_presets.java:3391
-#: build/trans_presets.java:3408 build/trans_presets.java:3417
-#: build/trans_presets.java:3424 build/trans_presets.java:3430
-#: build/trans_presets.java:3436 build/trans_presets.java:3445
-#: build/trans_presets.java:3454 build/trans_presets.java:3462
-#: build/trans_presets.java:3469 build/trans_presets.java:3477
-#: build/trans_presets.java:3484 build/trans_presets.java:3493
-#: build/trans_presets.java:3500 build/trans_presets.java:3509
-#: build/trans_presets.java:3518 build/trans_presets.java:3527
-#: build/trans_presets.java:3534 build/trans_presets.java:3543
-#: build/trans_presets.java:3549 build/trans_presets.java:3556
-#: build/trans_presets.java:3565 build/trans_presets.java:3571
-#: build/trans_presets.java:3580
+#: build/trans_presets.java:2167 build/trans_presets.java:2209
+#: build/trans_presets.java:2229 build/trans_presets.java:2241
+#: build/trans_presets.java:2261 build/trans_presets.java:2274
+#: build/trans_presets.java:2306 build/trans_presets.java:2898
+#: build/trans_presets.java:2961 build/trans_presets.java:3000
+#: build/trans_presets.java:3043 build/trans_presets.java:3084
+#: build/trans_presets.java:3122 build/trans_presets.java:3161
+#: build/trans_presets.java:3200 build/trans_presets.java:3244
+#: build/trans_presets.java:3354 build/trans_presets.java:3365
+#: build/trans_presets.java:3384 build/trans_presets.java:3437
+#: build/trans_presets.java:3457 build/trans_presets.java:3513
+#: build/trans_presets.java:3554 build/trans_presets.java:3643
+#: build/trans_presets.java:3653 build/trans_presets.java:3668
+#: build/trans_presets.java:3681 build/trans_presets.java:3719
+#: build/trans_presets.java:4070 build/trans_presets.java:4080
+#: build/trans_presets.java:4934 build/trans_presets.java:4946
+#: build/trans_presets.java:4999 build/trans_presets.java:5010
+#: build/trans_presets.java:5021 build/trans_presets.java:5033
+#: build/trans_presets.java:5044 build/trans_presets.java:5057
+#: build/trans_presets.java:5070 build/trans_presets.java:5081
+#: build/trans_presets.java:5095 build/trans_presets.java:5108
+#: build/trans_presets.java:5118 build/trans_presets.java:5130
+#: build/trans_presets.java:5140 build/trans_presets.java:5152
+#: build/trans_presets.java:5165 build/trans_presets.java:5175
+#: build/trans_presets.java:5186 build/trans_presets.java:5196
+#: build/trans_presets.java:5208 build/trans_presets.java:5219
+#: build/trans_presets.java:5229 build/trans_presets.java:5242
+#: build/trans_presets.java:5254 build/trans_presets.java:5264
+#: build/trans_presets.java:5277 build/trans_presets.java:5290
+#: build/trans_presets.java:5300 build/trans_presets.java:5310
+#: build/trans_presets.java:5324 build/trans_presets.java:5336
+#: build/trans_presets.java:5357 build/trans_presets.java:5370
+#: build/trans_presets.java:5381 build/trans_presets.java:5391
+#: build/trans_presets.java:5401 build/trans_presets.java:5414
+#: build/trans_presets.java:5427 build/trans_presets.java:5439
+#: build/trans_presets.java:5450 build/trans_presets.java:5462
+#: build/trans_presets.java:5473 build/trans_presets.java:5486
+#: build/trans_presets.java:5497 build/trans_presets.java:5510
+#: build/trans_presets.java:5523 build/trans_presets.java:5536
+#: build/trans_presets.java:5547 build/trans_presets.java:5560
+#: build/trans_presets.java:5570 build/trans_presets.java:5581
+#: build/trans_presets.java:5594 build/trans_presets.java:5604
+#: build/trans_presets.java:5617
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -28382,126 +28557,126 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: build/trans_presets.java:1434 build/trans_presets.java:1467
-#: build/trans_presets.java:1483 build/trans_presets.java:1491
-#: build/trans_presets.java:1507 build/trans_presets.java:1516
-#: build/trans_presets.java:1535 build/trans_presets.java:1911
-#: build/trans_presets.java:1931 build/trans_presets.java:1948
-#: build/trans_presets.java:1967 build/trans_presets.java:1986
-#: build/trans_presets.java:2002 build/trans_presets.java:2019
-#: build/trans_presets.java:2036 build/trans_presets.java:2067
-#: build/trans_presets.java:2154 build/trans_presets.java:2161
-#: build/trans_presets.java:2214 build/trans_presets.java:2230
-#: build/trans_presets.java:2253 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2386
-#: build/trans_presets.java:2429 build/trans_presets.java:2574
-#: build/trans_presets.java:2580 build/trans_presets.java:3113
-#: build/trans_presets.java:3121 build/trans_presets.java:3170
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3192 build/trans_presets.java:3199
-#: build/trans_presets.java:3224 build/trans_presets.java:3249
-#: build/trans_presets.java:3257 build/trans_presets.java:3263
-#: build/trans_presets.java:3271 build/trans_presets.java:3286
-#: build/trans_presets.java:3293 build/trans_presets.java:3299
-#: build/trans_presets.java:3307 build/trans_presets.java:3314
-#: build/trans_presets.java:3320 build/trans_presets.java:3337
-#: build/trans_presets.java:3343 build/trans_presets.java:3367
-#: build/trans_presets.java:3373 build/trans_presets.java:3383
-#: build/trans_presets.java:3391 build/trans_presets.java:3424
-#: build/trans_presets.java:3430 build/trans_presets.java:3436
-#: build/trans_presets.java:3462 build/trans_presets.java:3469
-#: build/trans_presets.java:3477 build/trans_presets.java:3484
-#: build/trans_presets.java:3500 build/trans_presets.java:3534
-#: build/trans_presets.java:3549 build/trans_presets.java:3556
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:2168 build/trans_presets.java:2210
+#: build/trans_presets.java:2230 build/trans_presets.java:2242
+#: build/trans_presets.java:2262 build/trans_presets.java:2275
+#: build/trans_presets.java:2307 build/trans_presets.java:2899
+#: build/trans_presets.java:2962 build/trans_presets.java:3001
+#: build/trans_presets.java:3044 build/trans_presets.java:3085
+#: build/trans_presets.java:3123 build/trans_presets.java:3162
+#: build/trans_presets.java:3201 build/trans_presets.java:3245
+#: build/trans_presets.java:3355 build/trans_presets.java:3366
+#: build/trans_presets.java:3438 build/trans_presets.java:3458
+#: build/trans_presets.java:3514 build/trans_presets.java:3644
+#: build/trans_presets.java:3654 build/trans_presets.java:3669
+#: build/trans_presets.java:3720 build/trans_presets.java:4071
+#: build/trans_presets.java:4081 build/trans_presets.java:4935
+#: build/trans_presets.java:4947 build/trans_presets.java:5000
+#: build/trans_presets.java:5011 build/trans_presets.java:5022
+#: build/trans_presets.java:5034 build/trans_presets.java:5045
+#: build/trans_presets.java:5082 build/trans_presets.java:5119
+#: build/trans_presets.java:5131 build/trans_presets.java:5141
+#: build/trans_presets.java:5153 build/trans_presets.java:5176
+#: build/trans_presets.java:5187 build/trans_presets.java:5197
+#: build/trans_presets.java:5209 build/trans_presets.java:5220
+#: build/trans_presets.java:5230 build/trans_presets.java:5255
+#: build/trans_presets.java:5265 build/trans_presets.java:5301
+#: build/trans_presets.java:5311 build/trans_presets.java:5325
+#: build/trans_presets.java:5337 build/trans_presets.java:5382
+#: build/trans_presets.java:5392 build/trans_presets.java:5402
+#: build/trans_presets.java:5440 build/trans_presets.java:5451
+#: build/trans_presets.java:5463 build/trans_presets.java:5474
+#: build/trans_presets.java:5498 build/trans_presets.java:5548
+#: build/trans_presets.java:5571 build/trans_presets.java:5582
+#: build/trans_presets.java:5605
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1435
+#: build/trans_presets.java:2170
 msgid "With shop"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1435
+#: build/trans_presets.java:2172
 msgid "convenience"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1435
+#: build/trans_presets.java:2173
 msgid "kiosk"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:2176
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:2177
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:2178
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:2179
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:2180
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:2181
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:2182
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:2183
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:2184
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:2185
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:2186
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1447
+#: build/trans_presets.java:2187
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:2188
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:2189
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:2190
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -28509,5 +28684,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:2193
 msgid "Charging Station"
 msgstr ""
@@ -28515,20 +28690,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
 #. item "Car/Charging Station" label "Edit Charging Station (for electric cars)"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:2195
 msgid "Edit Charging Station (for electric cars)"
 msgstr ""
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1459
+#: build/trans_presets.java:2199
 msgid "Amperage"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:2201
 msgid "Wash"
 msgstr "Bílaþvottastöð"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:2202
 msgid "Edit Car Wash"
 msgstr "Breyti bílaþvottastöð"
@@ -28536,5 +28711,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1470
+#: build/trans_presets.java:2214
 msgid "Car Dealer"
 msgstr ""
@@ -28542,5 +28717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:2216
 msgid "Edit Car Shop"
 msgstr "Breyti bílabúð"
@@ -28548,20 +28723,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1477 build/trans_presets.java:1539
+#: build/trans_presets.java:2221 build/trans_presets.java:2321
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:2222
 msgid "Edit Car Repair"
 msgstr ""
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:2233
 msgid "Tyres"
 msgstr ""
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:2234
 msgid "Edit Tyres"
 msgstr ""
@@ -28569,5 +28744,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1492 build/trans_presets.java:1544
+#: build/trans_presets.java:2244 build/trans_presets.java:2347
 msgid "Contact:"
 msgstr ""
@@ -28611,15 +28786,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1493 build/trans_presets.java:1545
-#: build/trans_presets.java:1771 build/trans_presets.java:1789
-#: build/trans_presets.java:1805 build/trans_presets.java:1822
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1879 build/trans_presets.java:1896
-#: build/trans_presets.java:1919 build/trans_presets.java:1938
-#: build/trans_presets.java:1955 build/trans_presets.java:1974
-#: build/trans_presets.java:1993 build/trans_presets.java:2009
-#: build/trans_presets.java:2026 build/trans_presets.java:2041
-#: build/trans_presets.java:2263 build/trans_presets.java:2419
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:2245 build/trans_presets.java:2348
+#: build/trans_presets.java:2602 build/trans_presets.java:2639
+#: build/trans_presets.java:2674 build/trans_presets.java:2710
+#: build/trans_presets.java:2747 build/trans_presets.java:2782
+#: build/trans_presets.java:2827 build/trans_presets.java:2863
+#: build/trans_presets.java:2927 build/trans_presets.java:2988
+#: build/trans_presets.java:3027 build/trans_presets.java:3070
+#: build/trans_presets.java:3111 build/trans_presets.java:3149
+#: build/trans_presets.java:3188 build/trans_presets.java:3216
+#: build/trans_presets.java:3528 build/trans_presets.java:3707
+#: build/trans_presets.java:6160
 msgid "Phone Number"
 msgstr ""
@@ -28644,14 +28819,14 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1494 build/trans_presets.java:1546
-#: build/trans_presets.java:1772 build/trans_presets.java:1790
-#: build/trans_presets.java:1806 build/trans_presets.java:1823
-#: build/trans_presets.java:1841 build/trans_presets.java:1858
-#: build/trans_presets.java:1880 build/trans_presets.java:1897
-#: build/trans_presets.java:1920 build/trans_presets.java:1939
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1994 build/trans_presets.java:2010
-#: build/trans_presets.java:2027 build/trans_presets.java:2042
-#: build/trans_presets.java:4023
+#: build/trans_presets.java:2246 build/trans_presets.java:2349
+#: build/trans_presets.java:2603 build/trans_presets.java:2640
+#: build/trans_presets.java:2675 build/trans_presets.java:2711
+#: build/trans_presets.java:2748 build/trans_presets.java:2783
+#: build/trans_presets.java:2828 build/trans_presets.java:2864
+#: build/trans_presets.java:2928 build/trans_presets.java:2989
+#: build/trans_presets.java:3028 build/trans_presets.java:3071
+#: build/trans_presets.java:3112 build/trans_presets.java:3150
+#: build/trans_presets.java:3189 build/trans_presets.java:3217
+#: build/trans_presets.java:6161
 msgid "Fax Number"
 msgstr ""
@@ -28678,14 +28853,14 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1495 build/trans_presets.java:1547
-#: build/trans_presets.java:1773 build/trans_presets.java:1791
-#: build/trans_presets.java:1807 build/trans_presets.java:1824
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1881 build/trans_presets.java:1898
-#: build/trans_presets.java:1921 build/trans_presets.java:1940
-#: build/trans_presets.java:1957 build/trans_presets.java:1976
-#: build/trans_presets.java:1995 build/trans_presets.java:2011
-#: build/trans_presets.java:2028 build/trans_presets.java:2043
-#: build/trans_presets.java:2264 build/trans_presets.java:4025
+#: build/trans_presets.java:2247 build/trans_presets.java:2350
+#: build/trans_presets.java:2604 build/trans_presets.java:2641
+#: build/trans_presets.java:2676 build/trans_presets.java:2712
+#: build/trans_presets.java:2749 build/trans_presets.java:2784
+#: build/trans_presets.java:2829 build/trans_presets.java:2865
+#: build/trans_presets.java:2929 build/trans_presets.java:2990
+#: build/trans_presets.java:3029 build/trans_presets.java:3072
+#: build/trans_presets.java:3113 build/trans_presets.java:3151
+#: build/trans_presets.java:3190 build/trans_presets.java:3218
+#: build/trans_presets.java:3529 build/trans_presets.java:6163
 msgid "Website"
 msgstr ""
@@ -28710,14 +28885,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1496 build/trans_presets.java:1548
-#: build/trans_presets.java:1774 build/trans_presets.java:1792
-#: build/trans_presets.java:1808 build/trans_presets.java:1825
-#: build/trans_presets.java:1843 build/trans_presets.java:1860
-#: build/trans_presets.java:1882 build/trans_presets.java:1899
-#: build/trans_presets.java:1922 build/trans_presets.java:1941
-#: build/trans_presets.java:1958 build/trans_presets.java:1977
-#: build/trans_presets.java:1996 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2044
-#: build/trans_presets.java:4026
+#: build/trans_presets.java:2248 build/trans_presets.java:2351
+#: build/trans_presets.java:2605 build/trans_presets.java:2642
+#: build/trans_presets.java:2677 build/trans_presets.java:2713
+#: build/trans_presets.java:2750 build/trans_presets.java:2785
+#: build/trans_presets.java:2830 build/trans_presets.java:2866
+#: build/trans_presets.java:2930 build/trans_presets.java:2991
+#: build/trans_presets.java:3030 build/trans_presets.java:3073
+#: build/trans_presets.java:3114 build/trans_presets.java:3152
+#: build/trans_presets.java:3191 build/trans_presets.java:3219
+#: build/trans_presets.java:6164
 msgid "Email Address"
 msgstr ""
@@ -28727,6 +28902,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1499 build/trans_presets.java:1538
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:2251 build/trans_presets.java:2316
+#: build/trans_presets.java:2369
 msgid "Rental"
 msgstr "Leiga"
@@ -28735,10 +28910,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:2254
 msgid "Edit Car Rental"
 msgstr "Breyti bílaleigu"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:2265
 msgid "Sharing"
 msgstr ""
@@ -28746,10 +28921,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:2267
 msgid "Edit Car Sharing"
 msgstr ""
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:2281
 msgid "Edit Motorcycle Parking"
 msgstr ""
@@ -28757,10 +28932,10 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1524 build/trans_presets.java:1557
+#: build/trans_presets.java:2284 build/trans_presets.java:2360
 msgid "Capacity"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:2295
 msgid "Motorcycle Dealer"
 msgstr ""
@@ -28768,25 +28943,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:2297
 msgid "Edit Shop Motorcycle"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:2301
 msgid "independent"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:2309
 msgid "Services:"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:2310
 msgid "Sale"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:2311
 msgctxt "motorcycle"
 msgid "yes"
@@ -28794,5 +28969,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:2312
 msgctxt "motorcycle"
 msgid "brand"
@@ -28800,5 +28975,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:2313
 msgctxt "motorcycle"
 msgid "used"
@@ -28806,5 +28981,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:2314
 msgctxt "motorcycle"
 msgid "no"
@@ -28815,6 +28990,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:1538 build/trans_presets.java:1539
-#: build/trans_presets.java:1541 build/trans_presets.java:1542
+#: build/trans_presets.java:2318 build/trans_presets.java:2323
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
 msgid "brand"
 msgstr ""
@@ -28822,35 +28997,35 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:1539 build/trans_presets.java:1541
+#: build/trans_presets.java:2324 build/trans_presets.java:2338
 msgid "oldtimer"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:2327
 msgid "Safety inspection"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:2329
 msgid "DEKRA"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:2330
 msgid "GTÜ"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:2331
 msgid "MOT"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:2332
 msgid "TÜV"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:2335
 msgid "Parts"
 msgstr ""
@@ -28860,6 +29035,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1542 build/trans_presets.java:2483
-#: build/trans_presets.java:3266 build/trans_presets.java:3267
+#: build/trans_presets.java:2341 build/trans_presets.java:3796
+#: build/trans_presets.java:5145 build/trans_presets.java:5146
 msgid "Clothes"
 msgstr "Föt"
@@ -28867,10 +29042,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:2357
 msgid "Edit Bicycle Parking"
 msgstr "Breyti hjólastæði"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:2362
 msgid "Bike Dealer"
 msgstr ""
@@ -28879,5 +29054,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:2365
 msgid "Edit Bicycle Shop"
 msgstr "Breyti hjólabúð"
@@ -28886,10 +29061,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:2372
 msgid "Edit Bicycle Rental"
 msgstr "Breyti hjólaleigu"
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:2378
 msgctxt "railway"
 msgid "Station"
@@ -28899,5 +29074,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:2381
 msgctxt "railway"
 msgid "Edit Station"
@@ -28905,5 +29080,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1583
+#: build/trans_presets.java:2386
 msgid "UIC-Reference"
 msgstr "UIC-Tilvísun"
@@ -28911,5 +29086,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:2389
 msgid "Railway Halt"
 msgstr ""
@@ -28917,5 +29092,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:2391
 msgid "Edit Halt"
 msgstr ""
@@ -28923,5 +29098,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:2398
 msgid "Tram Stop"
 msgstr ""
@@ -28930,5 +29105,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
 #. item "Public Transport/Tram Stop" label "Edit Tram Stop"
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:2401
 msgid "Edit Tram Stop"
 msgstr ""
@@ -28936,5 +29111,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:2408
 msgid "Railway Platform"
 msgstr ""
@@ -28943,5 +29118,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:2411
 msgid "Edit Railway Platform"
 msgstr ""
@@ -28953,5 +29128,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1611 build/trans_presets.java:1656
+#: build/trans_presets.java:2414 build/trans_presets.java:2468
 msgid "Reference (track number)"
 msgstr ""
@@ -28959,10 +29134,10 @@
 #. item "Public Transport/Railway Platform" check "Area"
 #. item "Public Transport/Bus Platform" check "Area"
-#: build/trans_presets.java:1613 build/trans_presets.java:1658
+#: build/trans_presets.java:2416 build/trans_presets.java:2470
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:2418
 msgid "Subway Entrance"
 msgstr ""
@@ -28971,5 +29146,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
 #. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:2421
 msgid "Edit Subway Entrance"
 msgstr ""
@@ -28977,5 +29152,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1623 build/trans_presets.java:2440
+#: build/trans_presets.java:2426 build/trans_presets.java:3735
 msgid "Wheelchair"
 msgstr ""
@@ -28984,5 +29159,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:2431
 msgid "Bus Station"
 msgstr "Strætóstöð"
@@ -28991,5 +29166,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
 #. item "Public Transport/Bus Station" label "Edit Bus Station"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:2434
 msgid "Edit Bus Station"
 msgstr "Breyti strætóstöð"
@@ -28997,5 +29172,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:2440
 msgid "Bus Stop"
 msgstr "Strætóstopp"
@@ -29005,5 +29180,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
 #. item "Public Transport/Bus Stop" label "Edit Bus Stop"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:2444
 msgid "Edit Bus Stop"
 msgstr "Breyti strætóstoppi"
@@ -29012,6 +29187,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1646 build/trans_presets.java:2502
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2449 build/trans_presets.java:3832
+#: build/trans_presets.java:3846
 msgid "Shelter"
 msgstr "Skýli"
@@ -29021,10 +29196,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1647 build/trans_presets.java:2494
+#: build/trans_presets.java:2453 build/trans_presets.java:3807
 msgid "Bench"
 msgstr "Bekkur"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:2457
 msgid "Tactile Paving"
 msgstr ""
@@ -29032,10 +29207,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:2464
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:2465
 msgid "Edit Bus Platform"
 msgstr ""
@@ -29043,10 +29218,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:2473
 msgid "Ticket Machine"
 msgstr ""
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:2479
 msgid "Reference Number"
 msgstr ""
@@ -29055,6 +29230,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1668 build/trans_presets.java:2454
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:2480 build/trans_presets.java:3753
+#: build/trans_presets.java:5650
 msgid "Coins"
 msgstr "Mynt"
@@ -29063,6 +29238,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1669 build/trans_presets.java:2455
-#: build/trans_presets.java:3592
+#: build/trans_presets.java:2481 build/trans_presets.java:3754
+#: build/trans_presets.java:5651
 msgid "Notes"
 msgstr "Athugasemd"
@@ -29071,6 +29246,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1670 build/trans_presets.java:2456
-#: build/trans_presets.java:3593
+#: build/trans_presets.java:2482 build/trans_presets.java:3755
+#: build/trans_presets.java:5652
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -29079,6 +29254,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1671 build/trans_presets.java:2457
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:2483 build/trans_presets.java:3756
+#: build/trans_presets.java:5653
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -29087,6 +29262,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1672 build/trans_presets.java:2458
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:2484 build/trans_presets.java:3757
+#: build/trans_presets.java:5654
 msgid "Credit cards"
 msgstr "Kreditkort"
@@ -29094,10 +29269,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1673 build/trans_presets.java:3596
+#: build/trans_presets.java:2485 build/trans_presets.java:5655
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Taxi"
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:2488
 msgid "Taxi"
 msgstr "Leigubílastöð"
@@ -29105,5 +29280,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:2490
 msgid "Edit Taxi station"
 msgstr "Breyti leigubílastöð"
@@ -29111,10 +29286,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:2495
 msgid "Airport"
 msgstr "Flugvöllur"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:2496
 msgid "Airport Ground"
 msgstr ""
@@ -29122,5 +29297,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:2498
 msgid "Edit Airport Ground"
 msgstr ""
@@ -29128,10 +29303,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:2502
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:2503
 msgid "ICAO"
 msgstr ""
@@ -29140,5 +29315,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:2508
 msgid "Runway"
 msgstr ""
@@ -29146,5 +29321,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:2510
 msgid "Edit Runway"
 msgstr ""
@@ -29152,5 +29327,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:2516
 msgid "Taxiway"
 msgstr ""
@@ -29158,5 +29333,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1706
+#: build/trans_presets.java:2518
 msgid "Edit Taxiway"
 msgstr ""
@@ -29164,5 +29339,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:2524
 msgid "Helipad"
 msgstr ""
@@ -29170,5 +29345,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:2526
 msgid "Edit Helipad"
 msgstr ""
@@ -29178,5 +29353,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1720 build/trans_presets.java:1722
+#: build/trans_presets.java:2532 build/trans_presets.java:2534
 msgid "Apron"
 msgstr ""
@@ -29186,5 +29361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1725 build/trans_presets.java:1727
+#: build/trans_presets.java:2537 build/trans_presets.java:2539
 msgid "Hangar"
 msgstr ""
@@ -29195,6 +29370,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1730 build/trans_presets.java:1732
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2542 build/trans_presets.java:2544
+#: build/trans_presets.java:4779
 msgid "Beacon"
 msgstr ""
@@ -29204,5 +29379,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1735 build/trans_presets.java:1737
+#: build/trans_presets.java:2547 build/trans_presets.java:2549
 msgid "Windsock"
 msgstr ""
@@ -29211,5 +29386,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:2553
 msgid "Terminal"
 msgstr ""
@@ -29217,10 +29392,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:2555
 msgid "Edit Terminal"
 msgstr ""
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:2559
 msgctxt "airport"
 msgid "Gate"
@@ -29229,15 +29404,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:2561
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. group "Facilities"
-#: build/trans_presets.java:1755 build/trans_presets.java:2432
+#: build/trans_presets.java:2567 build/trans_presets.java:3724
 msgid "Facilities"
 msgstr ""
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:2568
 msgid "Accommodation"
 msgstr ""
@@ -29249,5 +29424,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1757 build/trans_surveyor.java:43
+#: build/trans_presets.java:2569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hótel"
@@ -29256,5 +29431,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:2572
 msgid "Edit Hotel"
 msgstr "Breyti hóteli"
@@ -29268,8 +29443,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1764 build/trans_presets.java:1782
-#: build/trans_presets.java:1798 build/trans_presets.java:1815
-#: build/trans_presets.java:1833 build/trans_presets.java:1867
-#: build/trans_presets.java:1889 build/trans_presets.java:1912
+#: build/trans_presets.java:2576 build/trans_presets.java:2613
+#: build/trans_presets.java:2648 build/trans_presets.java:2684
+#: build/trans_presets.java:2721 build/trans_presets.java:2792
+#: build/trans_presets.java:2837 build/trans_presets.java:2901
 msgid "Stars"
 msgstr "Stjörnur"
@@ -29305,12 +29480,12 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1766 build/trans_presets.java:1784
-#: build/trans_presets.java:1800 build/trans_presets.java:1817
-#: build/trans_presets.java:1835 build/trans_presets.java:1852
-#: build/trans_presets.java:1869 build/trans_presets.java:1891
-#: build/trans_presets.java:1914 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1969
-#: build/trans_presets.java:1988 build/trans_presets.java:2004
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2579 build/trans_presets.java:2616
+#: build/trans_presets.java:2651 build/trans_presets.java:2687
+#: build/trans_presets.java:2724 build/trans_presets.java:2759
+#: build/trans_presets.java:2795 build/trans_presets.java:2840
+#: build/trans_presets.java:2904 build/trans_presets.java:2965
+#: build/trans_presets.java:3004 build/trans_presets.java:3047
+#: build/trans_presets.java:3088 build/trans_presets.java:3126
+#: build/trans_presets.java:3165
 msgid "Internet access"
 msgstr ""
@@ -29331,12 +29506,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1766 build/trans_presets.java:1784
-#: build/trans_presets.java:1800 build/trans_presets.java:1817
-#: build/trans_presets.java:1835 build/trans_presets.java:1852
-#: build/trans_presets.java:1869 build/trans_presets.java:1891
-#: build/trans_presets.java:1914 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1969
-#: build/trans_presets.java:1988 build/trans_presets.java:2004
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2581 build/trans_presets.java:2618
+#: build/trans_presets.java:2653 build/trans_presets.java:2689
+#: build/trans_presets.java:2726 build/trans_presets.java:2761
+#: build/trans_presets.java:2797 build/trans_presets.java:2842
+#: build/trans_presets.java:2906 build/trans_presets.java:2967
+#: build/trans_presets.java:3006 build/trans_presets.java:3049
+#: build/trans_presets.java:3090 build/trans_presets.java:3128
+#: build/trans_presets.java:3167
 msgid "wlan"
 msgstr ""
@@ -29357,12 +29532,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1766 build/trans_presets.java:1784
-#: build/trans_presets.java:1800 build/trans_presets.java:1817
-#: build/trans_presets.java:1835 build/trans_presets.java:1852
-#: build/trans_presets.java:1869 build/trans_presets.java:1891
-#: build/trans_presets.java:1914 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1969
-#: build/trans_presets.java:1988 build/trans_presets.java:2004
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2582 build/trans_presets.java:2619
+#: build/trans_presets.java:2654 build/trans_presets.java:2690
+#: build/trans_presets.java:2727 build/trans_presets.java:2762
+#: build/trans_presets.java:2798 build/trans_presets.java:2843
+#: build/trans_presets.java:2907 build/trans_presets.java:2968
+#: build/trans_presets.java:3007 build/trans_presets.java:3050
+#: build/trans_presets.java:3091 build/trans_presets.java:3129
+#: build/trans_presets.java:3168
 msgid "wired"
 msgstr ""
@@ -29389,12 +29564,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1766 build/trans_presets.java:1784
-#: build/trans_presets.java:1800 build/trans_presets.java:1817
-#: build/trans_presets.java:1835 build/trans_presets.java:1852
-#: build/trans_presets.java:1869 build/trans_presets.java:1891
-#: build/trans_presets.java:1914 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1969
-#: build/trans_presets.java:1988 build/trans_presets.java:2004
-#: build/trans_presets.java:2021 build/trans_style.java:1064
+#: build/trans_presets.java:2583 build/trans_presets.java:2620
+#: build/trans_presets.java:2655 build/trans_presets.java:2691
+#: build/trans_presets.java:2728 build/trans_presets.java:2763
+#: build/trans_presets.java:2799 build/trans_presets.java:2844
+#: build/trans_presets.java:2908 build/trans_presets.java:2969
+#: build/trans_presets.java:3008 build/trans_presets.java:3051
+#: build/trans_presets.java:3092 build/trans_presets.java:3130
+#: build/trans_presets.java:3169 build/trans_style.java:1064
 msgid "terminal"
 msgstr ""
@@ -29415,12 +29590,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1767 build/trans_presets.java:1785
-#: build/trans_presets.java:1801 build/trans_presets.java:1818
-#: build/trans_presets.java:1836 build/trans_presets.java:1853
-#: build/trans_presets.java:1870 build/trans_presets.java:1892
-#: build/trans_presets.java:1915 build/trans_presets.java:1934
-#: build/trans_presets.java:1951 build/trans_presets.java:1970
-#: build/trans_presets.java:1989 build/trans_presets.java:2005
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2586 build/trans_presets.java:2623
+#: build/trans_presets.java:2658 build/trans_presets.java:2694
+#: build/trans_presets.java:2731 build/trans_presets.java:2766
+#: build/trans_presets.java:2802 build/trans_presets.java:2847
+#: build/trans_presets.java:2911 build/trans_presets.java:2972
+#: build/trans_presets.java:3011 build/trans_presets.java:3054
+#: build/trans_presets.java:3095 build/trans_presets.java:3133
+#: build/trans_presets.java:3172
 msgid "Internet access fee"
 msgstr ""
@@ -29443,12 +29618,12 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1768 build/trans_presets.java:1786
-#: build/trans_presets.java:1802 build/trans_presets.java:1819
-#: build/trans_presets.java:1837 build/trans_presets.java:1854
-#: build/trans_presets.java:1871 build/trans_presets.java:1893
-#: build/trans_presets.java:1916 build/trans_presets.java:1935
-#: build/trans_presets.java:1952 build/trans_presets.java:1971
-#: build/trans_presets.java:1990 build/trans_presets.java:2006
-#: build/trans_presets.java:2023 build/trans_presets.java:2038
+#: build/trans_presets.java:2590 build/trans_presets.java:2627
+#: build/trans_presets.java:2662 build/trans_presets.java:2698
+#: build/trans_presets.java:2735 build/trans_presets.java:2770
+#: build/trans_presets.java:2806 build/trans_presets.java:2851
+#: build/trans_presets.java:2915 build/trans_presets.java:2976
+#: build/trans_presets.java:3015 build/trans_presets.java:3058
+#: build/trans_presets.java:3099 build/trans_presets.java:3137
+#: build/trans_presets.java:3176 build/trans_presets.java:3204
 msgid "Smoking"
 msgstr ""
@@ -29470,12 +29645,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1768 build/trans_presets.java:1786
-#: build/trans_presets.java:1802 build/trans_presets.java:1819
-#: build/trans_presets.java:1837 build/trans_presets.java:1854
-#: build/trans_presets.java:1871 build/trans_presets.java:1893
-#: build/trans_presets.java:1916 build/trans_presets.java:1935
-#: build/trans_presets.java:1952 build/trans_presets.java:1971
-#: build/trans_presets.java:1990 build/trans_presets.java:2006
-#: build/trans_presets.java:2023 build/trans_presets.java:2038
+#: build/trans_presets.java:2592 build/trans_presets.java:2629
+#: build/trans_presets.java:2664 build/trans_presets.java:2700
+#: build/trans_presets.java:2737 build/trans_presets.java:2772
+#: build/trans_presets.java:2808 build/trans_presets.java:2853
+#: build/trans_presets.java:2917 build/trans_presets.java:2978
+#: build/trans_presets.java:3017 build/trans_presets.java:3060
+#: build/trans_presets.java:3101 build/trans_presets.java:3139
+#: build/trans_presets.java:3178 build/trans_presets.java:3206
 msgid "dedicated"
 msgstr ""
@@ -29497,12 +29672,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1768 build/trans_presets.java:1786
-#: build/trans_presets.java:1802 build/trans_presets.java:1819
-#: build/trans_presets.java:1837 build/trans_presets.java:1854
-#: build/trans_presets.java:1871 build/trans_presets.java:1893
-#: build/trans_presets.java:1916 build/trans_presets.java:1935
-#: build/trans_presets.java:1952 build/trans_presets.java:1971
-#: build/trans_presets.java:1990 build/trans_presets.java:2006
-#: build/trans_presets.java:2023 build/trans_presets.java:2038
+#: build/trans_presets.java:2593 build/trans_presets.java:2630
+#: build/trans_presets.java:2665 build/trans_presets.java:2701
+#: build/trans_presets.java:2738 build/trans_presets.java:2773
+#: build/trans_presets.java:2809 build/trans_presets.java:2854
+#: build/trans_presets.java:2918 build/trans_presets.java:2979
+#: build/trans_presets.java:3018 build/trans_presets.java:3061
+#: build/trans_presets.java:3102 build/trans_presets.java:3140
+#: build/trans_presets.java:3179 build/trans_presets.java:3207
 msgid "separated"
 msgstr ""
@@ -29524,17 +29699,17 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1768 build/trans_presets.java:1786
-#: build/trans_presets.java:1802 build/trans_presets.java:1819
-#: build/trans_presets.java:1837 build/trans_presets.java:1854
-#: build/trans_presets.java:1871 build/trans_presets.java:1893
-#: build/trans_presets.java:1916 build/trans_presets.java:1935
-#: build/trans_presets.java:1952 build/trans_presets.java:1971
-#: build/trans_presets.java:1990 build/trans_presets.java:2006
-#: build/trans_presets.java:2023 build/trans_presets.java:2038
+#: build/trans_presets.java:2594 build/trans_presets.java:2631
+#: build/trans_presets.java:2666 build/trans_presets.java:2702
+#: build/trans_presets.java:2739 build/trans_presets.java:2774
+#: build/trans_presets.java:2810 build/trans_presets.java:2855
+#: build/trans_presets.java:2919 build/trans_presets.java:2980
+#: build/trans_presets.java:3019 build/trans_presets.java:3062
+#: build/trans_presets.java:3103 build/trans_presets.java:3141
+#: build/trans_presets.java:3180 build/trans_presets.java:3208
 msgid "isolated"
 msgstr ""
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:2607
 msgid "Motel"
 msgstr "Vegahótel"
@@ -29542,20 +29717,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:2609
 msgid "Edit Motel"
 msgstr "Breyti vegahóteli"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:2644
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:2645
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:2679
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -29563,10 +29738,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:2681
 msgid "Edit Chalet"
 msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:2715
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -29574,15 +29749,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2717
 msgid "Edit Hostel"
 msgstr "Breyti farfuglaheimili"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2752
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:1846
+#: build/trans_presets.java:2753
 msgid "Edit Alpine Hut"
 msgstr ""
@@ -29590,10 +29765,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2788
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2789
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
@@ -29601,30 +29776,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2818
 msgid "Number of places"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2819
 msgid "Requires a fee"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2822
 msgid "interval"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2824
 msgid "Power supply"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:2825
 msgid "Tents allowed"
 msgstr ""
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:2832
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -29632,10 +29807,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2834
 msgid "Edit Camping Site"
 msgstr "Breyti tjaldstæði"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:2869
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -29646,5 +29821,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:1903 build/trans_surveyor.java:47
+#: build/trans_presets.java:2870 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Veitingastaður"
@@ -29652,115 +29827,115 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2872
 msgid "Edit Restaurant"
 msgstr "Breyti veitingastað"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine"
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2876 build/trans_presets.java:2938
+#: build/trans_presets.java:3038
 msgid "Cuisine"
 msgstr "Matargerð"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2877 build/trans_presets.java:2939
 msgid "italian"
 msgstr "ítölsk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2878 build/trans_presets.java:2940
 msgid "chinese"
 msgstr "kínversk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2879 build/trans_presets.java:2941
 msgid "pizza"
 msgstr "pizza"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2880 build/trans_presets.java:2942
 msgid "burger"
 msgstr "hamborgarar"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2881 build/trans_presets.java:2943
 msgid "greek"
 msgstr "grísk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2882 build/trans_presets.java:2944
 msgid "german"
 msgstr "þýsk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2883 build/trans_presets.java:2945
 msgid "indian"
 msgstr "indversk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2884 build/trans_presets.java:2946
 msgid "regional"
 msgstr "að hætti heimamanna"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2885 build/trans_presets.java:2947
 msgid "kebab"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2886 build/trans_presets.java:2948
 msgid "turkish"
 msgstr "tyrknesk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2887 build/trans_presets.java:2949
 msgid "asian"
 msgstr "asísk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2888 build/trans_presets.java:2950
 msgid "thai"
 msgstr "tælensk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2889 build/trans_presets.java:2951
 msgid "mexican"
 msgstr "mexíkósk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2890 build/trans_presets.java:2952
 msgid "japanese"
 msgstr "japönsk"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2891 build/trans_presets.java:2953
 msgid "french"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2892 build/trans_presets.java:2954
 msgid "sandwich"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:2893 build/trans_presets.java:2955
 msgid "sushi"
 msgstr ""
@@ -29768,10 +29943,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1910 build/trans_presets.java:1985
+#: build/trans_presets.java:2895 build/trans_presets.java:3081
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:2932
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -29779,20 +29954,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:2934
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2956
 msgid "fish_and_chips"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2957
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:2993
 msgid "Food Court"
 msgstr ""
@@ -29800,10 +29975,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
 #. item "Food+Drinks/Food Court" label "Edit Food Court"
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:2995
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:3032
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -29811,15 +29986,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:3034
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:3039
 msgid "ice_cream"
 msgstr ""
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:3075
 msgid "Pub"
 msgstr "Bar"
@@ -29827,20 +30002,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:3077
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:3116
 msgid "Biergarten"
 msgstr "Bjórgarður (þ. Biergarten)"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:3117
 msgid "Edit Biergarten"
 msgstr "Breyti bjórgarði (þýska: Biergarten)"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:3154
 msgid "Bar"
 msgstr ""
@@ -29848,10 +30023,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:3156
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:3193
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -29859,25 +30034,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:3195
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
 #. group "Tourism"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:3222
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:3223
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:3224
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:3229
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -29885,10 +30060,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:3231
 msgid "Edit Viewpoint"
 msgstr "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:3234
 msgid "Look-Out Tower"
 msgstr ""
@@ -29896,20 +30071,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:3237
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:3248
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:3253
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:3254
 msgid "topo"
 msgstr ""
@@ -29942,5 +30117,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2074 build/trans_presets.java:4125
+#: build/trans_presets.java:3255 build/trans_presets.java:6294
 #: build/trans_style.java:472 build/trans_style.java:484
 #: build/trans_style.java:496 build/trans_style.java:502
@@ -29949,25 +30124,25 @@
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:3256
 msgid "scheme"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:3258
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:3259
 msgid "site"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:3260
 msgid "city"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:3261
 msgid "region"
 msgstr ""
@@ -29976,6 +30151,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2076 build/trans_presets.java:2092
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:3263 build/trans_presets.java:3285
+#: build/trans_presets.java:3335
 msgid "Closer Description"
 msgstr "Nánari lýsing"
@@ -29985,5 +30160,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2078 build/trans_presets.java:2101
+#: build/trans_presets.java:3265 build/trans_presets.java:3294
 msgid "Routes shown for:"
 msgstr ""
@@ -29991,5 +30166,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2079 build/trans_presets.java:2102
+#: build/trans_presets.java:3266 build/trans_presets.java:3295
 msgid "Hiking"
 msgstr ""
@@ -29998,6 +30173,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2080 build/trans_presets.java:2103
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:3267 build/trans_presets.java:3296
+#: build/trans_presets.java:4152
 msgid "Cycling"
 msgstr ""
@@ -30005,5 +30180,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2081 build/trans_presets.java:2104
+#: build/trans_presets.java:3268 build/trans_presets.java:3297
 msgid "Mountainbiking"
 msgstr ""
@@ -30012,6 +30187,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2082 build/trans_presets.java:2105
-#: build/trans_presets.java:2106 build/trans_presets.java:2668
+#: build/trans_presets.java:3269 build/trans_presets.java:3298
+#: build/trans_presets.java:4240
 msgid "Skiing"
 msgstr "Skíði"
@@ -30019,5 +30194,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2083 build/trans_presets.java:2107
+#: build/trans_presets.java:3270 build/trans_presets.java:3299
 msgid "Riding"
 msgstr ""
@@ -30025,50 +30200,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2084 build/trans_presets.java:2108
+#: build/trans_presets.java:3271 build/trans_presets.java:3300
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:3273
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:3278
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:3279
 msgid "notice"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:3280
 msgid "history"
 msgstr "sagnfræði"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:3281
 msgid "nature"
 msgstr "náttúran"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:3282
 msgid "wildlife"
 msgstr "dýralíf"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:3283
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:3287
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:3302
 msgid "Information Terminal"
 msgstr ""
@@ -30076,10 +30251,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2115 build/trans_presets.java:2125
+#: build/trans_presets.java:3307 build/trans_presets.java:3320
 msgid "Closer description"
 msgstr ""
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:3315
 msgid "Audioguide"
 msgstr ""
@@ -30087,25 +30262,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:3328
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:3329
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:3331
 msgid "Other Information Points"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:3338
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:3339
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -30114,10 +30289,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:3342
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:3346
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -30126,30 +30301,30 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:3349
 msgid "Edit Zoo"
 msgstr "Breyti dýragarð"
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:3359
 msgid "Theme Park"
 msgstr "Skemmtigarður"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:3360
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:3369
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:3370
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:3374
 msgid "Sauna"
 msgstr ""
@@ -30159,5 +30334,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2169 build/trans_presets.java:2172
+#: build/trans_presets.java:3375 build/trans_presets.java:3378
 msgid "Edit Sauna"
 msgstr ""
@@ -30185,15 +30360,15 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:2177 build/trans_presets.java:2287
-#: build/trans_presets.java:2395 build/trans_presets.java:3208
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
-#: build/trans_presets.java:3243 build/trans_presets.java:3280
-#: build/trans_presets.java:3329 build/trans_presets.java:3352
-#: build/trans_presets.java:3361 build/trans_presets.java:3408
-#: build/trans_presets.java:3417 build/trans_presets.java:3445
-#: build/trans_presets.java:3454 build/trans_presets.java:3493
-#: build/trans_presets.java:3509 build/trans_presets.java:3518
-#: build/trans_presets.java:3527 build/trans_presets.java:3543
-#: build/trans_presets.java:3565 build/trans_presets.java:3580
+#: build/trans_presets.java:3385 build/trans_presets.java:3555
+#: build/trans_presets.java:3682 build/trans_presets.java:5058
+#: build/trans_presets.java:5071 build/trans_presets.java:5096
+#: build/trans_presets.java:5109 build/trans_presets.java:5166
+#: build/trans_presets.java:5243 build/trans_presets.java:5278
+#: build/trans_presets.java:5291 build/trans_presets.java:5358
+#: build/trans_presets.java:5371 build/trans_presets.java:5415
+#: build/trans_presets.java:5428 build/trans_presets.java:5487
+#: build/trans_presets.java:5511 build/trans_presets.java:5524
+#: build/trans_presets.java:5537 build/trans_presets.java:5561
+#: build/trans_presets.java:5595 build/trans_presets.java:5618
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -30201,5 +30376,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:3395
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -30207,15 +30382,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:3397
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:3401
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:3402
 msgid "Edit Picnic Site"
 msgstr ""
@@ -30223,10 +30398,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2191 build/trans_presets.java:2506
+#: build/trans_presets.java:3405 build/trans_presets.java:3836
 msgid "Fireplace"
 msgstr "Eldstæði"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:3407
 msgid "Public Grill"
 msgstr ""
@@ -30234,15 +30409,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:3409
 msgid "Edit Public Grill"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:3413
 msgid "Covered"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:3417
 msgctxt "grill"
 msgid "Fuel"
@@ -30250,30 +30425,30 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:3418
 msgid "charcoal"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:3419
 msgid "electric"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:3423
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:3424
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. group "Culture"
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:3429
 msgid "Culture"
 msgstr ""
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:3430
 msgid "Museum"
 msgstr "Safn"
@@ -30281,10 +30456,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:3432
 msgid "Edit Museum"
 msgstr "Breyti safni"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:3442
 msgid "Theatre"
 msgstr "Leikhús"
@@ -30293,10 +30468,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:3445
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:3449
 msgid "Library"
 msgstr "Bókasafn"
@@ -30305,10 +30480,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:3452
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:3461
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -30316,10 +30491,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:3463
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:3467
 msgid "Artwork"
 msgstr "Listaverk"
@@ -30327,10 +30502,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:3469
 msgid "Edit Artwork"
 msgstr "Breyti listaverki"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:3473
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -30340,5 +30515,5 @@
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
 #. item "Culture/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:3477
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -30347,6 +30522,6 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3480 build/trans_presets.java:5980
+#: build/trans_presets.java:6018
 msgid "Religion"
 msgstr ""
@@ -30355,6 +30530,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3481 build/trans_presets.java:5981
+#: build/trans_presets.java:6019
 msgid "bahai"
 msgstr ""
@@ -30363,6 +30538,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3482 build/trans_presets.java:5982
+#: build/trans_presets.java:6020
 msgid "buddhist"
 msgstr ""
@@ -30371,6 +30546,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3483 build/trans_presets.java:5983
+#: build/trans_presets.java:6021
 msgid "christian"
 msgstr ""
@@ -30379,6 +30554,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3484 build/trans_presets.java:5984
+#: build/trans_presets.java:6022
 msgid "hindu"
 msgstr ""
@@ -30387,6 +30562,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3485 build/trans_presets.java:5985
+#: build/trans_presets.java:6023
 msgid "jain"
 msgstr ""
@@ -30395,6 +30570,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3486 build/trans_presets.java:5986
+#: build/trans_presets.java:6024
 msgid "jewish"
 msgstr ""
@@ -30403,6 +30578,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3487 build/trans_presets.java:5987
+#: build/trans_presets.java:6025
 msgid "muslim"
 msgstr ""
@@ -30411,6 +30586,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3488 build/trans_presets.java:5988
+#: build/trans_presets.java:6026
 msgid "sikh"
 msgstr ""
@@ -30419,6 +30594,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3489 build/trans_presets.java:5989
+#: build/trans_presets.java:6027
 msgid "spiritualist"
 msgstr ""
@@ -30427,6 +30602,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3490 build/trans_presets.java:5990
+#: build/trans_presets.java:6028
 msgid "taoist"
 msgstr ""
@@ -30435,6 +30610,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3491 build/trans_presets.java:5991
+#: build/trans_presets.java:6029
 msgid "unitarian"
 msgstr ""
@@ -30443,6 +30618,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2251 build/trans_presets.java:3913
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:3492 build/trans_presets.java:5992
+#: build/trans_presets.java:6030
 msgid "zoroastrian"
 msgstr ""
@@ -30451,6 +30626,6 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3494 build/trans_presets.java:5994
+#: build/trans_presets.java:6032
 msgid "Denomination"
 msgstr ""
@@ -30459,6 +30634,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3495 build/trans_presets.java:5995
+#: build/trans_presets.java:6033
 msgid "anglican"
 msgstr ""
@@ -30467,6 +30642,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3496 build/trans_presets.java:5996
+#: build/trans_presets.java:6034
 msgid "baptist"
 msgstr ""
@@ -30475,6 +30650,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3497 build/trans_presets.java:5997
+#: build/trans_presets.java:6035
 msgid "catholic"
 msgstr ""
@@ -30483,6 +30658,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3498 build/trans_presets.java:5998
+#: build/trans_presets.java:6036
 msgid "evangelical"
 msgstr ""
@@ -30491,6 +30666,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3499 build/trans_presets.java:5999
+#: build/trans_presets.java:6037
 msgid "jehovahs_witness"
 msgstr ""
@@ -30499,6 +30674,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3500 build/trans_presets.java:6000
+#: build/trans_presets.java:6038
 msgid "lutheran"
 msgstr ""
@@ -30507,6 +30682,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3501 build/trans_presets.java:6001
+#: build/trans_presets.java:6039
 msgid "methodist"
 msgstr ""
@@ -30515,6 +30690,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3502 build/trans_presets.java:6002
+#: build/trans_presets.java:6040
 msgid "mormon"
 msgstr ""
@@ -30523,6 +30698,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3503 build/trans_presets.java:6003
+#: build/trans_presets.java:6041
 msgid "orthodox"
 msgstr ""
@@ -30531,6 +30706,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3504 build/trans_presets.java:6004
+#: build/trans_presets.java:6042
 msgid "pentecostal"
 msgstr ""
@@ -30539,6 +30714,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3505 build/trans_presets.java:6005
+#: build/trans_presets.java:6043
 msgid "presbyterian"
 msgstr ""
@@ -30547,6 +30722,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3506 build/trans_presets.java:6006
+#: build/trans_presets.java:6044
 msgid "protestant"
 msgstr ""
@@ -30555,6 +30730,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3507 build/trans_presets.java:6007
+#: build/trans_presets.java:6045
 msgid "quaker"
 msgstr ""
@@ -30563,6 +30738,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3508 build/trans_presets.java:6008
+#: build/trans_presets.java:6046
 msgid "shia"
 msgstr ""
@@ -30571,11 +30746,11 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2252 build/trans_presets.java:3914
-#: build/trans_presets.java:3923
+#: build/trans_presets.java:3509 build/trans_presets.java:6009
+#: build/trans_presets.java:6047
 msgid "sunni"
 msgstr ""
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:3517
 msgid "Recording Studio"
 msgstr ""
@@ -30583,15 +30758,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:3519
 msgid "Edit Studio"
 msgstr ""
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:3525
 msgid "audio"
 msgstr ""
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:3526
 msgid "video"
 msgstr ""
@@ -30599,5 +30774,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2267 build/trans_presets.java:2268
+#: build/trans_presets.java:3532 build/trans_presets.java:3533
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -30605,10 +30780,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:3535
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:3539
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -30616,5 +30791,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:3541
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
@@ -30623,10 +30798,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2280 build/trans_presets.java:2282
+#: build/trans_presets.java:3545 build/trans_presets.java:3547
 msgid "Community Centre"
 msgstr ""
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:3558
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -30634,10 +30809,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:3560
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:3564
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -30646,10 +30821,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:3567
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:3571
 msgid "Prison"
 msgstr "Fangelsi"
@@ -30658,10 +30833,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:3574
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:3578
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -30671,10 +30846,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:3582
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:3586
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -30683,10 +30858,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:3589
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:3593
 msgid "Post Office"
 msgstr "Pósthús"
@@ -30694,25 +30869,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:3595
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
 
 #. group "Education"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:3601
 msgid "Education"
 msgstr ""
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:3602
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:3603
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Education/School"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:3607
 msgid "School"
 msgstr "Skóli"
@@ -30720,10 +30895,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:3609
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Education/University"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:3613
 msgid "University"
 msgstr "Háskóli"
@@ -30731,10 +30906,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:3615
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Education/College"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:3619
 msgid "College"
 msgstr "Menntaskóli"
@@ -30742,10 +30917,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:3621
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:3625
 msgid "Driving School"
 msgstr ""
@@ -30753,20 +30928,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:3627
 msgid "Edit Driving School"
 msgstr ""
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:3632
 msgid "License Classes"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:3635
 msgid "Health"
 msgstr "Heilsa"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:3636
 msgid "Doctors"
 msgstr "Læknir"
@@ -30774,20 +30949,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:3638
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:3647
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:3648
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:3657
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -30795,5 +30970,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:3659
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -30801,10 +30976,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:3661
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:3672
 msgid "Hearing Aids"
 msgstr ""
@@ -30812,10 +30987,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:3674
 msgid "Edit Hearing Aids"
 msgstr ""
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:3685
 msgid "Hospital"
 msgstr "Spítali"
@@ -30823,10 +30998,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:3687
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2403
+#: build/trans_presets.java:3691
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -30834,10 +31009,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:3693
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:3698
 msgid "Emergency Access Point"
 msgstr ""
@@ -30846,5 +31021,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:3701
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -30853,15 +31028,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:3704
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:3705
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:3708
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -30869,5 +31044,5 @@
 #. <space />
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:3711
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -30876,15 +31051,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:3714
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
-#. item "Facilities/Toilets"
-#: build/trans_presets.java:2433
-msgid "Toilets"
-msgstr "Salerni"
-
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:3737
 msgid "limited"
 msgstr ""
@@ -30892,15 +31062,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2441 build/trans_presets.java:3590
+#: build/trans_presets.java:3740 build/trans_presets.java:5649
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:3742
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:3747
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -30909,15 +31079,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:3750
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:3758
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:3760
 msgid "Clock"
 msgstr ""
@@ -30926,5 +31096,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:3763
 msgid "Edit Clock"
 msgstr ""
@@ -30934,5 +31104,5 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2467 build/trans_presets.java:3019
+#: build/trans_presets.java:3766 build/trans_presets.java:4813
 msgid "Display"
 msgstr ""
@@ -30940,5 +31110,5 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2467 build/trans_presets.java:3019
+#: build/trans_presets.java:3767 build/trans_presets.java:4814
 msgid "analog"
 msgstr ""
@@ -30946,75 +31116,75 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2467 build/trans_presets.java:3019
+#: build/trans_presets.java:3768 build/trans_presets.java:4815
 msgid "digital"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:3769
 msgid "sundial"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:3770
 msgid "unorthodox"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:3772
 msgid "Support"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:3773
 msgid "pole"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:3774
 msgid "wall_mounted"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:3775
 msgid "billboard"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:3778
 msgid "Visibility/readability"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:3779
 msgid "(up to 5m)"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:3780
 msgid "(up to 20m)"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:3781
 msgid "(more than 20m)"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:3783
 msgid "Shows current date"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:3784
 msgid "Shows temperature"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:3785
 msgid "Shows barometric pressure"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:3786
 msgid "Shows humidity"
 msgstr ""
@@ -31022,5 +31192,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:3789
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -31029,5 +31199,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:3792
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -31035,30 +31205,30 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:3794
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:3795
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:3797
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:3798
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:3799
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:3801
 msgid "Waste Basket"
 msgstr ""
@@ -31066,5 +31236,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:3803
 msgid "Edit Waste Basket"
 msgstr ""
@@ -31073,35 +31243,35 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:3810
 msgid "Backrest"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:3814
 msgid "Material"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:3815
 msgid "stone"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:3818
 msgid "plastic"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:3820
 msgid "Colour"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:3821
 msgid "black"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:3822
 msgid "brown"
 msgstr ""
@@ -31169,5 +31339,5 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2499 build/trans_style.java:2635
+#: build/trans_presets.java:3823 build/trans_style.java:2635
 #: build/trans_style.java:2641 build/trans_style.java:2647
 #: build/trans_style.java:2653 build/trans_style.java:2659
@@ -31179,40 +31349,40 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:3824
 msgid "red"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:3825
 msgid "blue"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:3826
 msgid "gray"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:3827
 msgid "white"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:3829
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:3833
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:3838
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:3839
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -31221,30 +31391,30 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2511 build/trans_presets.java:3774
+#: build/trans_presets.java:3841 build/trans_presets.java:5833
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:3842
 msgid "low"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:3843
 msgid "half"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:3844
 msgid "full"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:3851
 msgid "Hide"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:3856
 msgid "Lock"
 msgstr ""
@@ -31252,5 +31422,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:3863
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -31259,10 +31429,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:3866
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:3870
 msgid "Fire Hydrant"
 msgstr ""
@@ -31271,5 +31441,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:3873
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -31278,20 +31448,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2532 build/trans_presets.java:3295
+#: build/trans_presets.java:3878 build/trans_presets.java:5190
 msgid "Sports"
 msgstr "Íþróttir"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:3879
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:3880
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:3881
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -31305,6 +31475,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2539 build/trans_presets.java:2548
-#: build/trans_presets.java:2557 build/trans_presets.java:2566
+#: build/trans_presets.java:3885 build/trans_presets.java:3931
+#: build/trans_presets.java:3977 build/trans_presets.java:4023
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -31650,6 +31820,6 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3887 build/trans_presets.java:3933
+#: build/trans_presets.java:3979 build/trans_presets.java:4025
 #: build/trans_style.java:3071 build/trans_style.java:3077
 #: build/trans_style.java:3083 build/trans_style.java:3089
@@ -31687,6 +31857,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3888 build/trans_presets.java:3934
+#: build/trans_presets.java:3980 build/trans_presets.java:4026
 msgid "multi"
 msgstr ""
@@ -31696,6 +31866,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3889 build/trans_presets.java:3935
+#: build/trans_presets.java:3981 build/trans_presets.java:4027
 msgid "archery"
 msgstr "bogfimi"
@@ -31705,6 +31875,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3890 build/trans_presets.java:3936
+#: build/trans_presets.java:3982 build/trans_presets.java:4028
 msgid "athletics"
 msgstr ""
@@ -31714,6 +31884,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3891 build/trans_presets.java:3937
+#: build/trans_presets.java:3983 build/trans_presets.java:4029
 msgid "american_football"
 msgstr ""
@@ -31723,6 +31893,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3892 build/trans_presets.java:3938
+#: build/trans_presets.java:3984 build/trans_presets.java:4030
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
@@ -31732,6 +31902,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3893 build/trans_presets.java:3939
+#: build/trans_presets.java:3985 build/trans_presets.java:4031
 msgid "baseball"
 msgstr "hafnabolti"
@@ -31741,6 +31911,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3894 build/trans_presets.java:3940
+#: build/trans_presets.java:3986 build/trans_presets.java:4032
 msgid "basketball"
 msgstr "körfubolti"
@@ -31750,6 +31920,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3895 build/trans_presets.java:3941
+#: build/trans_presets.java:3987 build/trans_presets.java:4033
 msgid "boules"
 msgstr ""
@@ -31759,6 +31929,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3896 build/trans_presets.java:3942
+#: build/trans_presets.java:3988 build/trans_presets.java:4034
 msgid "bowls"
 msgstr ""
@@ -31768,6 +31938,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3897 build/trans_presets.java:3943
+#: build/trans_presets.java:3989 build/trans_presets.java:4035
 msgid "canadian_football"
 msgstr ""
@@ -31777,6 +31947,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3898 build/trans_presets.java:3944
+#: build/trans_presets.java:3990 build/trans_presets.java:4036
 msgid "canoe"
 msgstr ""
@@ -31786,6 +31956,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3899 build/trans_presets.java:3945
+#: build/trans_presets.java:3991 build/trans_presets.java:4037
 msgid "climbing"
 msgstr "klifur"
@@ -31795,6 +31965,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3900 build/trans_presets.java:3946
+#: build/trans_presets.java:3992 build/trans_presets.java:4038
 msgid "cricket"
 msgstr ""
@@ -31804,6 +31974,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3901 build/trans_presets.java:3947
+#: build/trans_presets.java:3993 build/trans_presets.java:4039
 msgid "cricket_nets"
 msgstr ""
@@ -31813,6 +31983,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3902 build/trans_presets.java:3948
+#: build/trans_presets.java:3994 build/trans_presets.java:4040
 msgid "croquet"
 msgstr ""
@@ -31822,6 +31992,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3903 build/trans_presets.java:3949
+#: build/trans_presets.java:3995 build/trans_presets.java:4041
 msgid "cycling"
 msgstr ""
@@ -31831,6 +32001,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3904 build/trans_presets.java:3950
+#: build/trans_presets.java:3996 build/trans_presets.java:4042
 msgid "dog_racing"
 msgstr ""
@@ -31840,6 +32010,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3905 build/trans_presets.java:3951
+#: build/trans_presets.java:3997 build/trans_presets.java:4043
 msgid "equestrian"
 msgstr ""
@@ -31849,6 +32019,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3906 build/trans_presets.java:3952
+#: build/trans_presets.java:3998 build/trans_presets.java:4044
 msgid "gaelic_football"
 msgstr ""
@@ -31858,6 +32028,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3907 build/trans_presets.java:3953
+#: build/trans_presets.java:3999 build/trans_presets.java:4045
 msgid "golf"
 msgstr ""
@@ -31867,6 +32037,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3908 build/trans_presets.java:3954
+#: build/trans_presets.java:4000 build/trans_presets.java:4046
 msgid "gymnastics"
 msgstr ""
@@ -31876,6 +32046,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3909 build/trans_presets.java:3955
+#: build/trans_presets.java:4001 build/trans_presets.java:4047
 msgid "hockey"
 msgstr "hokkí"
@@ -31885,6 +32055,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3910 build/trans_presets.java:3956
+#: build/trans_presets.java:4002 build/trans_presets.java:4048
 msgid "horse_racing"
 msgstr ""
@@ -31894,6 +32064,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3911 build/trans_presets.java:3957
+#: build/trans_presets.java:4003 build/trans_presets.java:4049
 msgid "motor"
 msgstr ""
@@ -31903,6 +32073,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3912 build/trans_presets.java:3958
+#: build/trans_presets.java:4004 build/trans_presets.java:4050
 msgid "pelota"
 msgstr ""
@@ -31912,6 +32082,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3913 build/trans_presets.java:3959
+#: build/trans_presets.java:4005 build/trans_presets.java:4051
 msgid "racquet"
 msgstr ""
@@ -31921,6 +32091,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3914 build/trans_presets.java:3960
+#: build/trans_presets.java:4006 build/trans_presets.java:4052
 msgid "rugby_league"
 msgstr ""
@@ -31930,6 +32100,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3915 build/trans_presets.java:3961
+#: build/trans_presets.java:4007 build/trans_presets.java:4053
 msgid "rugby_union"
 msgstr ""
@@ -31939,6 +32109,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3916 build/trans_presets.java:3962
+#: build/trans_presets.java:4008 build/trans_presets.java:4054
 msgid "shooting"
 msgstr "skotfimi"
@@ -31948,6 +32118,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3917 build/trans_presets.java:3963
+#: build/trans_presets.java:4009 build/trans_presets.java:4055
 msgid "skateboard"
 msgstr ""
@@ -31957,6 +32127,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3918 build/trans_presets.java:3964
+#: build/trans_presets.java:4010 build/trans_presets.java:4056
 msgid "skating"
 msgstr "skautar"
@@ -31966,6 +32136,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3919 build/trans_presets.java:3965
+#: build/trans_presets.java:4011 build/trans_presets.java:4057
 msgid "skiing"
 msgstr "skíði"
@@ -31975,6 +32145,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3920 build/trans_presets.java:3966
+#: build/trans_presets.java:4012 build/trans_presets.java:4058
 msgid "soccer"
 msgstr "fótbolti"
@@ -31984,6 +32154,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3921 build/trans_presets.java:3967
+#: build/trans_presets.java:4013 build/trans_presets.java:4059
 msgid "swimming"
 msgstr "sund"
@@ -31993,6 +32163,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3922 build/trans_presets.java:3968
+#: build/trans_presets.java:4014 build/trans_presets.java:4060
 msgid "table_tennis"
 msgstr "borðtennis"
@@ -32002,71 +32172,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2541 build/trans_presets.java:2550
-#: build/trans_presets.java:2559 build/trans_presets.java:2568
+#: build/trans_presets.java:3923 build/trans_presets.java:3969
+#: build/trans_presets.java:4015 build/trans_presets.java:4061
 msgid "tennis"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:3926
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:3927
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:3972
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2553
+#: build/trans_presets.java:3973
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:4018
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:4019
 msgid "Edit Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:4064
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:4065
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:4074
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:4075
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:4085
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:4086
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:4087
 msgid "Edit Multi"
 msgstr ""
@@ -32114,25 +32284,25 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2588 build/trans_presets.java:2594
-#: build/trans_presets.java:2600 build/trans_presets.java:2606
-#: build/trans_presets.java:2612 build/trans_presets.java:2618
-#: build/trans_presets.java:2624 build/trans_presets.java:2630
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2675 build/trans_presets.java:2682
-#: build/trans_presets.java:2690 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2708
-#: build/trans_presets.java:2714 build/trans_presets.java:2720
-#: build/trans_presets.java:2726 build/trans_presets.java:2732
-#: build/trans_presets.java:2738 build/trans_presets.java:2762
-#: build/trans_presets.java:2768 build/trans_presets.java:2774
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2792 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2810
-#: build/trans_presets.java:2816 build/trans_presets.java:2822
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:4090 build/trans_presets.java:4101
+#: build/trans_presets.java:4112 build/trans_presets.java:4123
+#: build/trans_presets.java:4134 build/trans_presets.java:4145
+#: build/trans_presets.java:4156 build/trans_presets.java:4167
+#: build/trans_presets.java:4178 build/trans_presets.java:4189
+#: build/trans_presets.java:4200 build/trans_presets.java:4211
+#: build/trans_presets.java:4222 build/trans_presets.java:4233
+#: build/trans_presets.java:4258 build/trans_presets.java:4270
+#: build/trans_presets.java:4283 build/trans_presets.java:4294
+#: build/trans_presets.java:4305 build/trans_presets.java:4316
+#: build/trans_presets.java:4327 build/trans_presets.java:4338
+#: build/trans_presets.java:4349 build/trans_presets.java:4360
+#: build/trans_presets.java:4371 build/trans_presets.java:4408
+#: build/trans_presets.java:4420 build/trans_presets.java:4431
+#: build/trans_presets.java:4442 build/trans_presets.java:4453
+#: build/trans_presets.java:4464 build/trans_presets.java:4475
+#: build/trans_presets.java:4486 build/trans_presets.java:4497
+#: build/trans_presets.java:4508 build/trans_presets.java:4519
+#: build/trans_presets.java:4532 build/trans_presets.java:4543
+#: build/trans_presets.java:4553 build/trans_presets.java:4563
+#: build/trans_presets.java:4574 build/trans_presets.java:4584
 msgid "type"
 msgstr "gerð"
@@ -32182,26 +32352,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2588 build/trans_presets.java:2594
-#: build/trans_presets.java:2600 build/trans_presets.java:2606
-#: build/trans_presets.java:2612 build/trans_presets.java:2618
-#: build/trans_presets.java:2624 build/trans_presets.java:2630
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2675 build/trans_presets.java:2682
-#: build/trans_presets.java:2690 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2708
-#: build/trans_presets.java:2714 build/trans_presets.java:2720
-#: build/trans_presets.java:2726 build/trans_presets.java:2732
-#: build/trans_presets.java:2738 build/trans_presets.java:2747
-#: build/trans_presets.java:2756 build/trans_presets.java:2762
-#: build/trans_presets.java:2768 build/trans_presets.java:2774
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2792 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2810
-#: build/trans_presets.java:2816 build/trans_presets.java:2822
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:4091 build/trans_presets.java:4102
+#: build/trans_presets.java:4113 build/trans_presets.java:4124
+#: build/trans_presets.java:4135 build/trans_presets.java:4146
+#: build/trans_presets.java:4157 build/trans_presets.java:4168
+#: build/trans_presets.java:4179 build/trans_presets.java:4190
+#: build/trans_presets.java:4201 build/trans_presets.java:4212
+#: build/trans_presets.java:4223 build/trans_presets.java:4234
+#: build/trans_presets.java:4259 build/trans_presets.java:4271
+#: build/trans_presets.java:4284 build/trans_presets.java:4295
+#: build/trans_presets.java:4306 build/trans_presets.java:4317
+#: build/trans_presets.java:4328 build/trans_presets.java:4339
+#: build/trans_presets.java:4350 build/trans_presets.java:4361
+#: build/trans_presets.java:4372 build/trans_presets.java:4387
+#: build/trans_presets.java:4400 build/trans_presets.java:4410
+#: build/trans_presets.java:4421 build/trans_presets.java:4432
+#: build/trans_presets.java:4443 build/trans_presets.java:4454
+#: build/trans_presets.java:4465 build/trans_presets.java:4476
+#: build/trans_presets.java:4487 build/trans_presets.java:4498
+#: build/trans_presets.java:4509 build/trans_presets.java:4520
+#: build/trans_presets.java:4533 build/trans_presets.java:4544
+#: build/trans_presets.java:4554 build/trans_presets.java:4564
+#: build/trans_presets.java:4575 build/trans_presets.java:4585
 msgid "pitch"
 msgstr "völlur"
@@ -32251,26 +32421,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2588 build/trans_presets.java:2594
-#: build/trans_presets.java:2600 build/trans_presets.java:2606
-#: build/trans_presets.java:2612 build/trans_presets.java:2618
-#: build/trans_presets.java:2624 build/trans_presets.java:2630
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2675 build/trans_presets.java:2682
-#: build/trans_presets.java:2690 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2708
-#: build/trans_presets.java:2714 build/trans_presets.java:2720
-#: build/trans_presets.java:2726 build/trans_presets.java:2732
-#: build/trans_presets.java:2738 build/trans_presets.java:2747
-#: build/trans_presets.java:2756 build/trans_presets.java:2762
-#: build/trans_presets.java:2768 build/trans_presets.java:2774
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2792 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2810
-#: build/trans_presets.java:2816 build/trans_presets.java:2822
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:4092 build/trans_presets.java:4103
+#: build/trans_presets.java:4114 build/trans_presets.java:4125
+#: build/trans_presets.java:4136 build/trans_presets.java:4147
+#: build/trans_presets.java:4158 build/trans_presets.java:4169
+#: build/trans_presets.java:4180 build/trans_presets.java:4191
+#: build/trans_presets.java:4202 build/trans_presets.java:4213
+#: build/trans_presets.java:4224 build/trans_presets.java:4235
+#: build/trans_presets.java:4260 build/trans_presets.java:4272
+#: build/trans_presets.java:4285 build/trans_presets.java:4296
+#: build/trans_presets.java:4307 build/trans_presets.java:4318
+#: build/trans_presets.java:4329 build/trans_presets.java:4340
+#: build/trans_presets.java:4351 build/trans_presets.java:4362
+#: build/trans_presets.java:4373 build/trans_presets.java:4388
+#: build/trans_presets.java:4401 build/trans_presets.java:4411
+#: build/trans_presets.java:4422 build/trans_presets.java:4433
+#: build/trans_presets.java:4444 build/trans_presets.java:4455
+#: build/trans_presets.java:4466 build/trans_presets.java:4477
+#: build/trans_presets.java:4488 build/trans_presets.java:4499
+#: build/trans_presets.java:4510 build/trans_presets.java:4521
+#: build/trans_presets.java:4534 build/trans_presets.java:4545
+#: build/trans_presets.java:4555 build/trans_presets.java:4565
+#: build/trans_presets.java:4576 build/trans_presets.java:4586
 msgid "sports_centre"
 msgstr "íþróttamiðstöð"
@@ -32315,24 +32485,24 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2588 build/trans_presets.java:2594
-#: build/trans_presets.java:2600 build/trans_presets.java:2606
-#: build/trans_presets.java:2612 build/trans_presets.java:2618
-#: build/trans_presets.java:2624 build/trans_presets.java:2630
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2675 build/trans_presets.java:2682
-#: build/trans_presets.java:2690 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2708
-#: build/trans_presets.java:2714 build/trans_presets.java:2720
-#: build/trans_presets.java:2726 build/trans_presets.java:2732
-#: build/trans_presets.java:2738 build/trans_presets.java:2747
-#: build/trans_presets.java:2756 build/trans_presets.java:2762
-#: build/trans_presets.java:2768 build/trans_presets.java:2774
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2792 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2810
-#: build/trans_presets.java:2816 build/trans_presets.java:2822
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:4093 build/trans_presets.java:4104
+#: build/trans_presets.java:4115 build/trans_presets.java:4126
+#: build/trans_presets.java:4137 build/trans_presets.java:4148
+#: build/trans_presets.java:4159 build/trans_presets.java:4170
+#: build/trans_presets.java:4181 build/trans_presets.java:4192
+#: build/trans_presets.java:4203 build/trans_presets.java:4214
+#: build/trans_presets.java:4225 build/trans_presets.java:4236
+#: build/trans_presets.java:4261 build/trans_presets.java:4273
+#: build/trans_presets.java:4286 build/trans_presets.java:4297
+#: build/trans_presets.java:4308 build/trans_presets.java:4319
+#: build/trans_presets.java:4330 build/trans_presets.java:4341
+#: build/trans_presets.java:4352 build/trans_presets.java:4363
+#: build/trans_presets.java:4374 build/trans_presets.java:4386
+#: build/trans_presets.java:4399 build/trans_presets.java:4412
+#: build/trans_presets.java:4423 build/trans_presets.java:4434
+#: build/trans_presets.java:4445 build/trans_presets.java:4456
+#: build/trans_presets.java:4467 build/trans_presets.java:4478
+#: build/trans_presets.java:4489 build/trans_presets.java:4500
+#: build/trans_presets.java:4511 build/trans_presets.java:4522
+#: build/trans_presets.java:4535
 msgid "stadium"
 msgstr "íþróttaleikvangur"
@@ -32380,150 +32550,150 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2588 build/trans_presets.java:2594
-#: build/trans_presets.java:2600 build/trans_presets.java:2606
-#: build/trans_presets.java:2612 build/trans_presets.java:2618
-#: build/trans_presets.java:2624 build/trans_presets.java:2630
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2675 build/trans_presets.java:2682
-#: build/trans_presets.java:2690 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2708
-#: build/trans_presets.java:2714 build/trans_presets.java:2720
-#: build/trans_presets.java:2726 build/trans_presets.java:2732
-#: build/trans_presets.java:2738 build/trans_presets.java:2762
-#: build/trans_presets.java:2768 build/trans_presets.java:2774
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2792 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2810
-#: build/trans_presets.java:2816 build/trans_presets.java:2822
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:4094 build/trans_presets.java:4105
+#: build/trans_presets.java:4116 build/trans_presets.java:4127
+#: build/trans_presets.java:4138 build/trans_presets.java:4149
+#: build/trans_presets.java:4160 build/trans_presets.java:4171
+#: build/trans_presets.java:4182 build/trans_presets.java:4193
+#: build/trans_presets.java:4204 build/trans_presets.java:4215
+#: build/trans_presets.java:4226 build/trans_presets.java:4237
+#: build/trans_presets.java:4262 build/trans_presets.java:4274
+#: build/trans_presets.java:4287 build/trans_presets.java:4298
+#: build/trans_presets.java:4309 build/trans_presets.java:4320
+#: build/trans_presets.java:4331 build/trans_presets.java:4342
+#: build/trans_presets.java:4353 build/trans_presets.java:4364
+#: build/trans_presets.java:4375 build/trans_presets.java:4413
+#: build/trans_presets.java:4424 build/trans_presets.java:4435
+#: build/trans_presets.java:4446 build/trans_presets.java:4457
+#: build/trans_presets.java:4468 build/trans_presets.java:4479
+#: build/trans_presets.java:4490 build/trans_presets.java:4501
+#: build/trans_presets.java:4512 build/trans_presets.java:4523
+#: build/trans_presets.java:4536 build/trans_presets.java:4546
+#: build/trans_presets.java:4556 build/trans_presets.java:4566
+#: build/trans_presets.java:4577 build/trans_presets.java:4587
 msgid "track"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:4097
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:4098
 msgid "Edit 10pin"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:4108
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:4109
 msgid "Edit Athletics"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:4119
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:4120
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:4130
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:4131
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:4141
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:4142
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:4153
 msgid "Edit Cycling"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:4163
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:4164
 msgid "Edit Dog Racing"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:4174
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:4175
 msgid "Edit Equestrian"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:4185
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:4186
 msgid "Edit Horse Racing"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:4196
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:4197
 msgid "Edit Gymnastics"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:4207
 msgid "Skating"
 msgstr "Skautar"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:4208
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:4218
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:4219
 msgid "Edit Skateboard"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:4229
 msgid "Swimming"
 msgstr "Sund"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:4230
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -32531,60 +32701,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:4242
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:4245
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:4246
 msgid "downhill"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:4247
 msgid "nordic"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:4248
 msgid "snow_park"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:4250
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:4251
 msgid "novice"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:4252
 msgid "easy"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:4254
 msgid "advanced"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:4255
 msgid "expert"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:4256
 msgid "freeride"
 msgstr ""
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:4265
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -32592,105 +32762,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:4267
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:4278
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:4279
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:4280
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:4290
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:4291
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:4301
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:4302
 msgid "Edit American Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:4312
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:4313
 msgid "Edit Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:4323
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:4324
 msgid "Edit Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:4334
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:4335
 msgid "Edit Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:4345
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:4346
 msgid "Edit Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:4356
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:4357
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:4367
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:4368
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:4378
 msgid "Volleyball"
 msgstr ""
@@ -32698,10 +32868,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:4380
 msgid "Edit Volleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:4391
 msgid "Beachvolleyball"
 msgstr ""
@@ -32709,120 +32879,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:4393
 msgid "Edit Beachvolleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:4404
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:4405
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:4409
 msgid "golf_course"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:4416
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:4417
 msgid "Edit Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:4427
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:4428
 msgid "Edit Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:4438
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:4439
 msgid "Edit Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:4449
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:4450
 msgid "Edit Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:4460
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:4461
 msgid "Edit Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:4471
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:4472
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:4482
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:4483
 msgid "Edit Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:4493
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:4494
 msgid "Edit Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:4504
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:4505
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:4515
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:4516
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
@@ -32830,40 +33000,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2825 build/trans_presets.java:2826
+#: build/trans_presets.java:4527 build/trans_presets.java:4528
 msgid "Motorsport"
 msgstr ""
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:4529
 msgid "Edit Motorsport"
 msgstr ""
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:4539
 msgid "Karting"
 msgstr ""
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:4540
 msgid "Edit Karting"
 msgstr ""
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:4549
 msgid "Motocross"
 msgstr ""
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:4550
 msgid "Edit Motocross"
 msgstr ""
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:4559
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:4560
 msgid "Edit Safety Training"
 msgstr ""
@@ -32871,20 +33041,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:4570
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:4571
 msgid "Edit Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:4580
 msgid "RC Car"
 msgstr ""
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:4581
 msgid "Edit RC Car"
 msgstr ""
@@ -32892,10 +33062,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:2865 build/trans_presets.java:2866
+#: build/trans_presets.java:4592 build/trans_presets.java:4593
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:4594
 msgid "Building"
 msgstr "Bygging"
@@ -32903,25 +33073,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:4597
 msgid "Tower"
 msgstr "Turn"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:4598
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:4601
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:4602
 msgid "communication"
 msgstr ""
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:4603
 msgid "observation"
 msgstr ""
@@ -32930,5 +33100,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:2876 build/trans_presets.java:2897
+#: build/trans_presets.java:4606 build/trans_presets.java:4627
 msgid "Height (meters)"
 msgstr ""
@@ -32936,5 +33106,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:4610
 msgid "Flagpole"
 msgstr ""
@@ -32944,15 +33114,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:4615
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:4616
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:4620
 msgid "Chimney"
 msgstr ""
@@ -32960,10 +33130,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:4622
 msgid "Edit Chimney"
 msgstr ""
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:4629
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -32971,20 +33141,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:4631
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:4635
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:4636
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:4640
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -32993,5 +33163,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
 #. item "Man Made/Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:4643
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
@@ -32999,30 +33169,30 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:2916 build/trans_presets.java:3042
+#: build/trans_presets.java:4648 build/trans_presets.java:4851
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:4649
 msgid "heat"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:4650
 msgid "oil"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:4651
 msgid "sewage"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:4653
 msgid "Location"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:4654
 msgctxt "pipeline"
 msgid "underground"
@@ -33030,5 +33200,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:4655
 msgctxt "pipeline"
 msgid "underwater"
@@ -33036,5 +33206,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:4656
 msgctxt "pipeline"
 msgid "overground"
@@ -33042,5 +33212,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:4659
 msgid "Crane"
 msgstr "Krani"
@@ -33048,10 +33218,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:2921
+#: build/trans_presets.java:4661
 msgid "Edit Crane"
 msgstr "Breyti krana"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:4665
 msgid "Mineshaft"
 msgstr ""
@@ -33060,25 +33230,25 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:4668
 msgid "Edit Mineshaft"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:4671
 msgid "Function"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:4672
 msgid "winding"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:4673
 msgid "air"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:4675
 msgid "Depth in meters"
 msgstr ""
@@ -33086,5 +33256,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4677 build/trans_presets.java:4709
 msgid "Resource"
 msgstr ""
@@ -33092,5 +33262,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4678 build/trans_presets.java:4710
 msgid "aggregate"
 msgstr ""
@@ -33098,5 +33268,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4679 build/trans_presets.java:4711
 msgid "bauxite"
 msgstr ""
@@ -33105,6 +33275,6 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:4680 build/trans_presets.java:4712
+#: build/trans_presets.java:4849
 msgid "coal"
 msgstr ""
@@ -33112,5 +33282,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4681 build/trans_presets.java:4713
 msgid "copper"
 msgstr ""
@@ -33118,5 +33288,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4682 build/trans_presets.java:4714
 msgid "dimension_stone"
 msgstr ""
@@ -33124,5 +33294,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4683 build/trans_presets.java:4715
 msgid "gold"
 msgstr ""
@@ -33130,5 +33300,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4684 build/trans_presets.java:4716
 msgid "ilmenite"
 msgstr ""
@@ -33136,5 +33306,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4685 build/trans_presets.java:4717
 msgid "iron_ore"
 msgstr ""
@@ -33142,5 +33312,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4686 build/trans_presets.java:4718
 msgid "lead"
 msgstr ""
@@ -33148,5 +33318,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4687 build/trans_presets.java:4719
 msgid "limestone"
 msgstr ""
@@ -33154,5 +33324,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4688 build/trans_presets.java:4720
 msgid "nickel"
 msgstr ""
@@ -33160,5 +33330,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4689 build/trans_presets.java:4721
 msgid "rutile"
 msgstr ""
@@ -33166,5 +33336,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4690 build/trans_presets.java:4722
 msgid "salt"
 msgstr ""
@@ -33172,5 +33342,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4691 build/trans_presets.java:4723
 msgid "silver"
 msgstr ""
@@ -33178,5 +33348,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4692 build/trans_presets.java:4724
 msgid "tin"
 msgstr ""
@@ -33184,5 +33354,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4693 build/trans_presets.java:4725
 msgid "zinc"
 msgstr ""
@@ -33190,10 +33360,10 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:4694 build/trans_presets.java:4726
 msgid "zircon"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:4696
 msgid "Visible Headframe"
 msgstr ""
@@ -33201,10 +33371,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:2936 build/trans_presets.java:2946
+#: build/trans_presets.java:4700 build/trans_presets.java:4728
 msgid "Disused"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:4702
 msgid "Adit"
 msgstr ""
@@ -33212,10 +33382,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
 #. item "Man Made/Man Made/Adit" label "Edit Adit"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:4704
 msgid "Edit Adit"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:4707
 msgid "Length in meters"
 msgstr ""
@@ -33223,15 +33393,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:4731
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:4732
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:4736
 msgid "Water Works"
 msgstr ""
@@ -33239,10 +33409,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_works" />
 #. item "Man Made/Man Made/Water Works" label "Edit Water Works"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:4738
 msgid "Edit Water Works"
 msgstr ""
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:4744
 msgid "Wastewater Plant"
 msgstr ""
@@ -33252,10 +33422,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:4748
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:4752
 msgid "Watermill"
 msgstr ""
@@ -33263,10 +33433,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
 #. item "Man Made/Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:4754
 msgid "Edit Watermill"
 msgstr ""
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:4759
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -33275,10 +33445,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:4762
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:4766
 msgid "Water Well"
 msgstr ""
@@ -33286,5 +33456,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
 #. item "Man Made/Man Made/Water Well" label "Edit Water Well"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:4768
 msgid "Edit Water Well"
 msgstr ""
@@ -33292,5 +33462,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:4773
 msgid "Lighthouse"
 msgstr "Viti"
@@ -33298,5 +33468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:4775
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
@@ -33304,10 +33474,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:4781
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:4785
 msgid "Street Lamp"
 msgstr ""
@@ -33315,5 +33485,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstreet_lamp" />
 #. item "Man Made/Man Made/Street Lamp" label "Edit Street Lamp"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:4787
 msgid "Edit Street Lamp"
 msgstr ""
@@ -33322,15 +33492,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:4790
 msgid "Operation times"
 msgstr ""
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:4791
 msgid "Mo-Fr 22:00-05:00"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:4794
 msgid "Measurement Station"
 msgstr ""
@@ -33338,55 +33508,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
 #. item "Man Made/Man Made/Measurement Station" label "Edit Measurement Station"
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:4796
 msgid "Edit Measurement Station"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:4801
 msgid "Measurement"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:4802
 msgid "particulate_matter"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:4803
 msgid "seismic"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:4804
 msgid "water_level"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:4805
 msgid "weather"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:4807
 msgid "Recording"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:4808
 msgid "manually"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:4809
 msgid "automated"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:4810
 msgid "remote"
 msgstr ""
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:4819
 msgid "Survey Point"
 msgstr ""
@@ -33394,10 +33564,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
 #. item "Man Made/Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:4821
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:4825
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -33405,30 +33575,30 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:4827
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:4831
 msgid "indoor"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:4832
 msgid "outdoor"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:4833
 msgid "public"
 msgstr ""
 
 #. group "Power"
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:4837
 msgid "Power"
 msgstr ""
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:4838
 msgid "Power Generator"
 msgstr "Rafall"
@@ -33438,35 +33608,35 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:4842
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:4845
 msgid "wind"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:4846
 msgid "hydro"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:4847
 msgid "fossil"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:4848
 msgid "nuclear"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:4850
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:4855
 msgid "Power Station"
 msgstr "Orkuver"
@@ -33475,10 +33645,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:4858
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:4864
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -33487,5 +33657,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
 #. item "Power/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:4867
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -33493,10 +33663,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3060 build/trans_presets.java:3093
+#: build/trans_presets.java:4870 build/trans_presets.java:4906
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:4872
 msgid "Cable Distribution Cabinet"
 msgstr ""
@@ -33505,5 +33675,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dcable_distribution_cabinet" />
 #. item "Power/Cable Distribution Cabinet" label "Edit Cable Distribution Cabinet"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:4875
 msgid "Edit Cable Distribution Cabinet"
 msgstr ""
@@ -33511,5 +33681,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:4881
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -33520,5 +33690,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:4886
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
@@ -33526,10 +33696,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:4888
 msgid "Tower reference"
 msgstr ""
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:4890
 msgid "Pole"
 msgstr ""
@@ -33538,16 +33708,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:4893
 msgid "Edit Power Pole"
 msgstr ""
 
-#. <key key="power" value="tower" />
+#. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:4895
 msgid "Pole reference"
 msgstr ""
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:4897
 msgid "Power Line"
 msgstr "Raflína"
@@ -33556,15 +33726,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:4900
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:4901
 msgid "Line type"
 msgstr ""
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:4902
 msgctxt "Power Line"
 msgid "line"
@@ -33572,5 +33742,5 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:4903
 msgctxt "Power Line"
 msgid "minor_line"
@@ -33578,40 +33748,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:4910
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:4911
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:4912
 msgid "single"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:4913
 msgid "double"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:4914
 msgid "triple"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:4915
 msgid "quad"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:4919
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:4920
 msgid "Castle"
 msgstr "Kastali"
@@ -33620,20 +33790,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:4923
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3109
+#: build/trans_presets.java:4928
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:4929
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:4938
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -33642,10 +33812,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:4941
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:4950
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -33653,10 +33823,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:4952
 msgid "Edit Battlefield"
 msgstr "Breyti vígvelli"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:4956
 msgid "Palaeontological Site"
 msgstr ""
@@ -33664,5 +33834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:4958
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -33670,15 +33840,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:4963
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:4964
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:4968
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -33686,60 +33856,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:4970
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:4974
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:4975
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:4979
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:4980
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:4984
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:4985
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:4991
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:4992
 msgid "Food"
 msgstr ""
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:4993
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:4994
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:5003
 msgid "Convenience Store"
 msgstr ""
@@ -33747,10 +33917,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:5005
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3179
+#: build/trans_presets.java:5014
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -33758,5 +33928,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:5016
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
@@ -33764,5 +33934,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:5026
 msgid "Baker"
 msgstr "Bakarí"
@@ -33770,10 +33940,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:5028
 msgid "Edit Baker"
 msgstr "Breyti bakaríi"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:5037
 msgid "Butcher"
 msgstr "Slátrari"
@@ -33781,10 +33951,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:5039
 msgid "Edit Butcher"
 msgstr "Breyti slátrara"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:5048
 msgid "Seafood"
 msgstr ""
@@ -33792,10 +33962,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:5050
 msgid "Edit Seafood"
 msgstr ""
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3210
+#: build/trans_presets.java:5061
 msgid "Deli (Fine Food)"
 msgstr ""
@@ -33803,10 +33973,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
 #. item "Shops/Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:5063
 msgid "Edit Deli (Fine Food)"
 msgstr ""
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:5074
 msgid "Confectionery"
 msgstr ""
@@ -33814,5 +33984,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:5076
 msgid "Edit Confectionery"
 msgstr ""
@@ -33820,5 +33990,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:5086
 msgid "Marketplace"
 msgstr ""
@@ -33826,10 +33996,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:5088
 msgid "Edit Marketplace"
 msgstr ""
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:5099
 msgid "Greengrocer"
 msgstr ""
@@ -33837,15 +34007,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:5101
 msgid "Edit Greengrocer"
 msgstr ""
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:5112
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:5113
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
@@ -33853,5 +34023,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:5123
 msgid "Alcohol"
 msgstr ""
@@ -33859,25 +34029,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3254
+#: build/trans_presets.java:5125
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:5134
 msgid "Beverages"
 msgstr "Vínbúð"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:5135
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:5147
 msgid "Edit Clothes Shop"
 msgstr ""
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:5156
 msgid "Boutique"
 msgstr ""
@@ -33885,20 +34055,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:5158
 msgid "Edit Boutique"
 msgstr ""
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:5169
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:5170
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:5179
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -33906,10 +34076,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3290
+#: build/trans_presets.java:5181
 msgid "Edit Outdoor Shop"
 msgstr "Breyti útivistarbúð"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3296
+#: build/trans_presets.java:5191
 msgid "Edit Sports Shop"
 msgstr ""
@@ -33917,5 +34087,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3302
+#: build/trans_presets.java:5201
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -33923,10 +34093,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3304
+#: build/trans_presets.java:5203
 msgid "Edit Dry Cleaning"
 msgstr "Breyti efnalaug"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3309
+#: build/trans_presets.java:5212
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -33934,20 +34104,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:5214
 msgid "Edit Laundry"
 msgstr "Breyti þvottahúsi"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:5223
 msgid "Tailor"
 msgstr ""
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3317
+#: build/trans_presets.java:5224
 msgid "Edit Tailor"
 msgstr ""
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3322
+#: build/trans_presets.java:5233
 msgid "Fabric"
 msgstr ""
@@ -33955,35 +34125,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3324
+#: build/trans_presets.java:5235
 msgid "Edit Fabric"
 msgstr ""
 
 #. group "Electronic"
-#: build/trans_presets.java:3332
+#: build/trans_presets.java:5247
 msgid "Electronic"
 msgstr ""
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:5248
 msgid "Computer"
 msgstr "Tölvubúð"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:5249
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3339
+#: build/trans_presets.java:5258
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:5259
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3345
+#: build/trans_presets.java:5268
 msgid "Mobile Phone"
 msgstr ""
@@ -33991,10 +34161,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:5270
 msgid "Edit Mobile Phone"
 msgstr ""
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:5281
 msgid "Vacuum Cleaner"
 msgstr ""
@@ -34002,35 +34172,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3356
+#: build/trans_presets.java:5283
 msgid "Edit Vacuum Cleaner"
 msgstr ""
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3363
+#: build/trans_presets.java:5294
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3364
+#: build/trans_presets.java:5295
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:5304
 msgid "Video"
 msgstr ""
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3370
+#: build/trans_presets.java:5305
 msgid "Edit Video Shop"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:3376
+#: build/trans_presets.java:5315
 msgid "Cash"
 msgstr "Fjármál"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3377
+#: build/trans_presets.java:5316
 msgid "Bank"
 msgstr "Banki"
@@ -34038,5 +34208,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:5318
 msgid "Edit Bank"
 msgstr "Breyti banka"
@@ -34044,10 +34214,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3384 build/trans_presets.java:3393
+#: build/trans_presets.java:5327 build/trans_presets.java:5340
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:5329
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -34055,5 +34225,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
 #. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3388
+#: build/trans_presets.java:5331
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -34061,10 +34231,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3395
+#: build/trans_presets.java:5342
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3401
+#: build/trans_presets.java:5348
 msgid "Department Store"
 msgstr ""
@@ -34072,10 +34242,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3403
+#: build/trans_presets.java:5350
 msgid "Edit Department Store"
 msgstr ""
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3410
+#: build/trans_presets.java:5361
 msgid "Mall"
 msgstr ""
@@ -34083,5 +34253,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:5363
 msgid "Edit Mall"
 msgstr ""
@@ -34089,35 +34259,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3420
+#: build/trans_presets.java:5375
 msgid "Chemist"
 msgstr ""
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3421
+#: build/trans_presets.java:5376
 msgid "Edit Chemist"
 msgstr ""
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:5385
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3427
+#: build/trans_presets.java:5386
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3432
+#: build/trans_presets.java:5395
 msgid "Optician"
 msgstr ""
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:5396
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:5405
 msgid "Jewelry"
 msgstr ""
@@ -34125,10 +34295,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:5407
 msgid "Edit Jewelry"
 msgstr ""
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3447
+#: build/trans_presets.java:5418
 msgid "Erotic"
 msgstr ""
@@ -34136,5 +34306,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:5420
 msgid "Edit Erotic"
 msgstr ""
@@ -34142,5 +34312,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3457
+#: build/trans_presets.java:5432
 msgid "Florist"
 msgstr "Blómabúð"
@@ -34148,10 +34318,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:5434
 msgid "Edit Florist"
 msgstr "Breyti blómabúð"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3464
+#: build/trans_presets.java:5443
 msgid "Garden Centre"
 msgstr ""
@@ -34159,5 +34329,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3466
+#: build/trans_presets.java:5445
 msgid "Edit Garden Centre"
 msgstr ""
@@ -34165,5 +34335,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3472
+#: build/trans_presets.java:5455
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -34171,10 +34341,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Other/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3474
+#: build/trans_presets.java:5457
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3479
+#: build/trans_presets.java:5466
 msgid "Hardware"
 msgstr ""
@@ -34182,10 +34352,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3481
+#: build/trans_presets.java:5468
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3486
+#: build/trans_presets.java:5477
 msgid "Paint"
 msgstr ""
@@ -34193,5 +34363,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3488
+#: build/trans_presets.java:5479
 msgid "Edit Paint"
 msgstr ""
@@ -34199,15 +34369,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3496
+#: build/trans_presets.java:5491
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3497
+#: build/trans_presets.java:5492
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3502
+#: build/trans_presets.java:5501
 msgid "Kitchen"
 msgstr ""
@@ -34215,10 +34385,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3504
+#: build/trans_presets.java:5503
 msgid "Edit Kitchen"
 msgstr ""
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3511
+#: build/trans_presets.java:5514
 msgid "Curtain"
 msgstr ""
@@ -34226,10 +34396,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:5516
 msgid "Edit Curtain"
 msgstr ""
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:5527
 msgid "Frame"
 msgstr ""
@@ -34237,5 +34407,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3522
+#: build/trans_presets.java:5529
 msgid "Edit Frames"
 msgstr ""
@@ -34243,15 +34413,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3530
+#: build/trans_presets.java:5541
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3531
+#: build/trans_presets.java:5542
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3536
+#: build/trans_presets.java:5551
 msgid "Copyshop"
 msgstr ""
@@ -34259,15 +34429,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3538
+#: build/trans_presets.java:5553
 msgid "Edit Copyshop"
 msgstr ""
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3545
+#: build/trans_presets.java:5564
 msgid "Book Store"
 msgstr ""
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3546
+#: build/trans_presets.java:5565
 msgid "Edit Book Store"
 msgstr ""
@@ -34275,15 +34445,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3552
+#: build/trans_presets.java:5575
 msgid "Travel Agency"
 msgstr "Ferðaskrifstofa"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3553
+#: build/trans_presets.java:5576
 msgid "Edit Travel Agency"
 msgstr "Breyti ferðaskrifstofu"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3558
+#: build/trans_presets.java:5585
 msgid "Musical Instrument"
 msgstr ""
@@ -34291,20 +34461,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3560
+#: build/trans_presets.java:5587
 msgid "Edit Musical Instruments"
 msgstr ""
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3567
+#: build/trans_presets.java:5598
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3568
+#: build/trans_presets.java:5599
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3573
+#: build/trans_presets.java:5608
 msgid "Variety Store"
 msgstr ""
@@ -34312,10 +34482,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3575
+#: build/trans_presets.java:5610
 msgid "Edit Variety Store"
 msgstr ""
 
 #. item "Vending machine"
-#: build/trans_presets.java:3583
+#: build/trans_presets.java:5622
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -34323,226 +34493,226 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3585
+#: build/trans_presets.java:5624
 msgid "Edit Vending machine"
 msgstr ""
 
 #. <key key="amenity" value="vending_machine" />
-#. item "Vending machine" combo "Vending products"
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products"
+#: build/trans_presets.java:5626
 msgid "Vending products"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5627
 msgid "public_transport_tickets"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5628
 msgid "public_transport_plans"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5629
 msgid "parking_tickets"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5630
 msgid "food"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5631
 msgid "drinks"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5632
 msgid "sweets"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5633
 msgid "cigarettes"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5634
 msgid "photos"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5635
 msgid "animal_food"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5636
 msgid "news_papers"
 msgstr "dagblöð"
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5637
 msgid "toys"
 msgstr "dót"
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5638
 msgid "stamps"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5639
 msgid "SIM-cards"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5640
 msgid "telephone_vouchers"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5641
 msgid "vouchers"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5642
 msgid "bicycle_tube"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5643
 msgid "condoms"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5644
 msgid "tampons"
 msgstr ""
 
-#. item "Vending machine" combo "Vending products" display value
-#: build/trans_presets.java:3587
+#. item "Vending machine" multiselect "Vending products" display value
+#: build/trans_presets.java:5645
 msgid "excrement_bags"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3599 build/trans_presets.java:3716
+#: build/trans_presets.java:5658 build/trans_presets.java:5775
 msgid "Geography"
 msgstr "Landafræði"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3600
+#: build/trans_presets.java:5659
 msgid "Boundaries"
 msgstr "Landamæri"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:5660
 msgid "National"
 msgstr ""
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3602
+#: build/trans_presets.java:5661
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3607
+#: build/trans_presets.java:5666
 msgid "Administrative"
 msgstr ""
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:5667
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3613
+#: build/trans_presets.java:5672
 msgid "Civil"
 msgstr ""
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3614
+#: build/trans_presets.java:5673
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3619
+#: build/trans_presets.java:5678
 msgid "Political"
 msgstr ""
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3620
+#: build/trans_presets.java:5679
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3625
+#: build/trans_presets.java:5684
 msgid "National park"
 msgstr ""
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3626
+#: build/trans_presets.java:5685
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. group "Places"
-#: build/trans_presets.java:3632
+#: build/trans_presets.java:5691
 msgid "Places"
 msgstr "Staðir"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:5692
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3634
+#: build/trans_presets.java:5693
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3641
+#: build/trans_presets.java:5700
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Places/State"
-#: build/trans_presets.java:3647
+#: build/trans_presets.java:5706
 msgid "State"
 msgstr "Fylki"
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3648
+#: build/trans_presets.java:5707
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3654
+#: build/trans_presets.java:5713
 msgid "Region"
 msgstr "Svæði"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3655
+#: build/trans_presets.java:5714
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Places/County"
-#: build/trans_presets.java:3661
+#: build/trans_presets.java:5720
 msgid "County"
 msgstr "Sýsla"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3662
+#: build/trans_presets.java:5721
 msgid "Edit County"
 msgstr "Breyti sýslu"
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:5729
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:5735
 msgid "Town"
 msgstr "Bær"
@@ -34550,10 +34720,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3678
+#: build/trans_presets.java:5737
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3684
+#: build/trans_presets.java:5743
 msgid "Suburb"
 msgstr "Hverfi"
@@ -34561,25 +34731,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3686
+#: build/trans_presets.java:5745
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3692
+#: build/trans_presets.java:5751
 msgid "Village"
 msgstr "Þorp"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3693
+#: build/trans_presets.java:5752
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3699
+#: build/trans_presets.java:5758
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3700
+#: build/trans_presets.java:5759
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -34587,5 +34757,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3707
+#: build/trans_presets.java:5766
 msgid "Locality"
 msgstr ""
@@ -34593,10 +34763,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3709
+#: build/trans_presets.java:5768
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3717
+#: build/trans_presets.java:5776
 msgid "Peak"
 msgstr "Tindur"
@@ -34604,10 +34774,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3719
+#: build/trans_presets.java:5778
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3725
+#: build/trans_presets.java:5784
 msgid "Glacier"
 msgstr "Jökull"
@@ -34615,10 +34785,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3727
+#: build/trans_presets.java:5786
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3733
+#: build/trans_presets.java:5792
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -34626,10 +34796,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3735
+#: build/trans_presets.java:5794
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3741
+#: build/trans_presets.java:5800
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -34637,5 +34807,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3743
+#: build/trans_presets.java:5802
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
@@ -34643,5 +34813,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3749
+#: build/trans_presets.java:5808
 msgid "Island"
 msgstr "Eyja"
@@ -34649,10 +34819,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3751
+#: build/trans_presets.java:5810
 msgid "Edit Island"
 msgstr "Breyti eyju"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3757
+#: build/trans_presets.java:5816
 msgid "Islet"
 msgstr ""
@@ -34660,15 +34830,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3759
+#: build/trans_presets.java:5818
 msgid "Edit Islet"
 msgstr ""
 
 #. group "Nature"
-#: build/trans_presets.java:3766
+#: build/trans_presets.java:5825
 msgid "Nature"
 msgstr ""
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3767
+#: build/trans_presets.java:5826
 msgid "Tree"
 msgstr "Tré"
@@ -34677,15 +34847,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3770
+#: build/trans_presets.java:5829
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3775
+#: build/trans_presets.java:5834
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:5836
 msgid "Wood"
 msgstr "Skógur"
@@ -34694,5 +34864,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:3780
+#: build/trans_presets.java:5839
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -34700,5 +34870,5 @@
 #. item "Nature/Wood" combo "Type" display value
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3783 build/trans_presets.java:3792
+#: build/trans_presets.java:5843 build/trans_presets.java:5856
 msgid "coniferous"
 msgstr "barrskógur"
@@ -34706,5 +34876,5 @@
 #. item "Nature/Wood" combo "Type" display value
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3783 build/trans_presets.java:3792
+#: build/trans_presets.java:5844 build/trans_presets.java:5857
 msgid "deciduous"
 msgstr "laufskógur"
@@ -34712,10 +34882,10 @@
 #. item "Nature/Wood" combo "Type" display value
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3783 build/trans_presets.java:3792
+#: build/trans_presets.java:5845 build/trans_presets.java:5858
 msgid "mixed"
 msgstr "blandaður"
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:5848
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -34724,15 +34894,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:3788
+#: build/trans_presets.java:5851
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3794
+#: build/trans_presets.java:5861
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:3795
+#: build/trans_presets.java:5862
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -34740,15 +34910,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:5867
 msgid "Scree"
 msgstr ""
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:3801
+#: build/trans_presets.java:5868
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:5872
 msgid "Fell"
 msgstr ""
@@ -34756,20 +34926,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:3807
+#: build/trans_presets.java:5874
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:3811
+#: build/trans_presets.java:5878
 msgid "Scrub"
 msgstr ""
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:5879
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:3816
+#: build/trans_presets.java:5883
 msgid "Heath"
 msgstr ""
@@ -34777,15 +34947,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:3818
+#: build/trans_presets.java:5885
 msgid "Edit Heath"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:3823
+#: build/trans_presets.java:5890
 msgid "Land use"
 msgstr "Landnýting"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:3824
+#: build/trans_presets.java:5891
 msgid "Farmyard"
 msgstr ""
@@ -34794,40 +34964,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:3827
+#: build/trans_presets.java:5894
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:5899
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:5900
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:5905
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:5906
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3844
+#: build/trans_presets.java:5911
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:5912
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:3850
+#: build/trans_presets.java:5917
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -34835,15 +35005,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:5919
 msgid "Edit Greenhouse Horticulture"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3858
+#: build/trans_presets.java:5925
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:3859
+#: build/trans_presets.java:5926
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -34851,25 +35021,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:5932
 msgid "Garden"
 msgstr "Garður"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:5933
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3870
+#: build/trans_presets.java:5937
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:3871
+#: build/trans_presets.java:5938
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:3876
+#: build/trans_presets.java:5943
 msgid "Village Green"
 msgstr ""
@@ -34877,10 +35047,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
 #. item "Land use/Village Green" label "Edit Village Green Landuse"
-#: build/trans_presets.java:3878
+#: build/trans_presets.java:5945
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Common"
-#: build/trans_presets.java:3883
+#: build/trans_presets.java:5950
 msgid "Common"
 msgstr ""
@@ -34888,20 +35058,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:3885
+#: build/trans_presets.java:5952
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3889
+#: build/trans_presets.java:5956
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:3890
+#: build/trans_presets.java:5957
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:5961
 msgid "Recreation Ground"
 msgstr ""
@@ -34909,5 +35079,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
 #. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
-#: build/trans_presets.java:3896
+#: build/trans_presets.java:5963
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -34915,15 +35085,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:5969
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:3903
+#: build/trans_presets.java:5970
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:5975
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -34931,10 +35101,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:3910
+#: build/trans_presets.java:5977
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:6012
 msgid "Cemetery"
 msgstr ""
@@ -34942,40 +35112,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:3918
+#: build/trans_presets.java:6014
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:6050
 msgid "Retail"
 msgstr "Smásala"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:3926
+#: build/trans_presets.java:6051
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:6056
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:6057
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3937
+#: build/trans_presets.java:6062
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:3938
+#: build/trans_presets.java:6063
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:3943
+#: build/trans_presets.java:6068
 msgid "Garages"
 msgstr ""
@@ -34983,10 +35153,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:3945
+#: build/trans_presets.java:6070
 msgid "Edit Garages"
 msgstr ""
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:6076
 msgid "Railway land"
 msgstr ""
@@ -34994,15 +35164,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:3953
+#: build/trans_presets.java:6078
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3958
+#: build/trans_presets.java:6083
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:6084
 msgid "Edit Military Landuse"
 msgstr ""
@@ -35010,55 +35180,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3965
+#: build/trans_presets.java:6090
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:3966
+#: build/trans_presets.java:6091
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3971
+#: build/trans_presets.java:6096
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:6097
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3977
+#: build/trans_presets.java:6102
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:3978
+#: build/trans_presets.java:6103
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3983
+#: build/trans_presets.java:6108
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:3984
+#: build/trans_presets.java:6109
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3989
+#: build/trans_presets.java:6114
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:3990
+#: build/trans_presets.java:6115
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Annotation"
-#: build/trans_presets.java:3997
+#: build/trans_presets.java:6122
 msgid "Annotation"
 msgstr ""
@@ -35067,5 +35237,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:4001
+#: build/trans_presets.java:6126
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -35073,5 +35243,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4003
+#: build/trans_presets.java:6128
 msgid "House number"
 msgstr "Húsnúmer"
@@ -35079,5 +35249,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4005
+#: build/trans_presets.java:6130
 msgid "House name"
 msgstr "Nafn húss"
@@ -35086,55 +35256,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4006 build/trans_presets.java:4123
+#: build/trans_presets.java:6131 build/trans_presets.java:6292
 msgid "Street name"
 msgstr "Nafn götu"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4007
+#: build/trans_presets.java:6132
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4008
+#: build/trans_presets.java:6133
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:6134
 msgid "Country code"
 msgstr "Landskóði"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:6135
 msgid "AT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:6136
 msgid "CH"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:6137
 msgid "DE"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:6138
 msgid "FR"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:6139
 msgid "GB"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:6140
 msgid "IT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:6141
 msgid "US"
 msgstr ""
@@ -35143,5 +35313,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4015
+#: build/trans_presets.java:6148
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -35149,35 +35319,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4017
+#: build/trans_presets.java:6150
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4017
+#: build/trans_presets.java:6151
 msgid "odd"
 msgstr ""
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4017
+#: build/trans_presets.java:6152
 msgid "even"
 msgstr ""
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4017
+#: build/trans_presets.java:6154
 msgid "alphabetic"
 msgstr ""
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4019
+#: build/trans_presets.java:6157
 msgid "Contact"
 msgstr ""
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4020
+#: build/trans_presets.java:6158
 msgid "Edit Contact information"
 msgstr ""
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4029
+#: build/trans_presets.java:6167
 msgid "Image"
 msgstr ""
@@ -35187,5 +35357,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4037
+#: build/trans_presets.java:6175
 msgid "Edit Multipolygon"
 msgstr "Breyta marghyrningi"
@@ -35197,5 +35367,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4043 build/trans_presets.java:4060
+#: build/trans_presets.java:6181 build/trans_presets.java:6204
 msgid "outer segment"
 msgstr ""
@@ -35203,5 +35373,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4044 build/trans_presets.java:4061
+#: build/trans_presets.java:6182 build/trans_presets.java:6205
 msgid "inner segment"
 msgstr ""
@@ -35209,5 +35379,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4047
+#: build/trans_presets.java:6185
 msgid "Boundary"
 msgstr ""
@@ -35218,5 +35388,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4052
+#: build/trans_presets.java:6190
 msgid "Edit Boundary"
 msgstr ""
@@ -35224,40 +35394,40 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4056
+#: build/trans_presets.java:6194
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4056
+#: build/trans_presets.java:6195
 msgid "administrative"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4056
+#: build/trans_presets.java:6196
 msgid "national"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4056
+#: build/trans_presets.java:6197
 msgid "civil"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4056
+#: build/trans_presets.java:6198
 msgid "political"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4057
+#: build/trans_presets.java:6200
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:6206
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:6207
 msgid "Administration centre"
 msgstr ""
@@ -35265,5 +35435,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4066
+#: build/trans_presets.java:6210
 msgid "Turn restriction"
 msgstr "Beygjutakmörkun"
@@ -35272,5 +35442,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4069
+#: build/trans_presets.java:6213
 msgid "Edit Turn Restriction"
 msgstr "Breyti beygjutakmörkun"
@@ -35278,40 +35448,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:6215
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:6216
 msgid "no_left_turn"
 msgstr "vinstri beygjur óleyfilegar"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:6217
 msgid "no_right_turn"
 msgstr "hægri beygjur óleyfilegar"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:6218
 msgid "no_straight_on"
 msgstr "óleyfilegt að halda beint áfrám"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:6219
 msgid "no_u_turn"
 msgstr "óleyfilegt að taka U-beygju"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:6220
 msgid "only_right_turn"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:6221
 msgid "only_left_turn"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:6222
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -35320,15 +35490,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4076
+#: build/trans_presets.java:6228
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:6229
 msgid "via node or way"
 msgstr "gegnum hnút eða veg"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:6230
 msgid "to way"
 msgstr "að vegi"
@@ -35336,5 +35506,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4081
+#: build/trans_presets.java:6233
 msgid "Route"
 msgstr ""
@@ -35343,5 +35513,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:6236
 msgid "Edit Route"
 msgstr ""
@@ -35349,25 +35519,25 @@
 #. <key key="type" value="route" />
 #. item "Relations/Route" combo "Route type"
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6238
 msgid "Route type"
 msgstr ""
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6240
 msgid "bus"
 msgstr ""
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6241
 msgid "road"
 msgstr ""
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6242
 msgid "ferry"
 msgstr ""
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6243
 msgid "ski"
 msgstr ""
@@ -35419,5 +35589,5 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4086 build/trans_style.java:200
+#: build/trans_presets.java:6244 build/trans_style.java:200
 #: build/trans_style.java:526 build/trans_style.java:532
 #: build/trans_style.java:552 build/trans_style.java:558
@@ -35428,15 +35598,15 @@
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6245
 msgid "hiking"
 msgstr ""
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6246
 msgid "tram"
 msgstr ""
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:6247
 msgid "detour"
 msgstr ""
@@ -35449,10 +35619,10 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4086 build/trans_style.java:973
+#: build/trans_presets.java:6249 build/trans_style.java:973
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Symbol description"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:6253
 msgid "Symbol description"
 msgstr ""
@@ -35462,35 +35632,35 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4092 build/trans_presets.java:4112
+#: build/trans_presets.java:6256 build/trans_presets.java:6281
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:4094
+#: build/trans_presets.java:6258
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4094
+#: build/trans_presets.java:6259
 msgid "proposed"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4094
+#: build/trans_presets.java:6260
 msgid "alternate"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4094
+#: build/trans_presets.java:6261
 msgid "temporary"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4094
+#: build/trans_presets.java:6262
 msgid "connection"
 msgstr ""
 
 #. item "Relations/Route" text "Color (hex)"
-#: build/trans_presets.java:4095
+#: build/trans_presets.java:6264
 msgid "Color (hex)"
 msgstr ""
@@ -35499,30 +35669,30 @@
 #. <roles>
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:6267
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4099
+#: build/trans_presets.java:6268
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4100
+#: build/trans_presets.java:6269
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:4101
+#: build/trans_presets.java:6270
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:4102
+#: build/trans_presets.java:6271
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "backward halt point"
-#: build/trans_presets.java:4103
+#: build/trans_presets.java:6272
 msgid "backward halt point"
 msgstr ""
@@ -35530,5 +35700,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4106
+#: build/trans_presets.java:6275
 msgid "Route network"
 msgstr ""
@@ -35536,5 +35706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4108
+#: build/trans_presets.java:6277
 msgid "Edit route network"
 msgstr ""
@@ -35543,5 +35713,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4116
+#: build/trans_presets.java:6285
 msgid "member"
 msgstr ""
@@ -35549,5 +35719,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:6288
 msgid "Associated street"
 msgstr ""
@@ -35555,10 +35725,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4121
+#: build/trans_presets.java:6290
 msgid "Edit associated street"
 msgstr ""
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4126
+#: build/trans_presets.java:6295
 msgid "house"
 msgstr ""
@@ -38903,4 +39073,7 @@
 #~ "reyna síðar."
 
+#~ msgid "Preparing..."
+#~ msgstr "Undirbý..."
+
 #~ msgid "Uploading..."
 #~ msgstr "Hleð upp gögnum..."
@@ -39174,4 +39347,7 @@
 #~ msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni"
 
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Sláðu inn hnitin fyrst"
+
 #~ msgid "zoom"
 #~ msgstr "þysja"
@@ -39221,4 +39397,7 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Athuga núverandi val eða öll gögn í laginu."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Breytingarárekstrar."
 
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
