Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 25188)
+++ applications/editors/josm/i18n/po/nb.po	(revision 25273)
@@ -4,10 +4,10 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:638
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:639
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 17:30+0100\n"
+"POT-Creation-Date: 2011-02-12 11:59+0100\n"
 "PO-Revision-Date: 2010-12-03 21:21+0000\n"
 "Last-Translator: Stian Ellingsen <stiell@gmail.com>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-01-30 11:16+0000\n"
-"X-Generator: Launchpad (build 12274)\n"
+"X-Launchpad-Export-Date: 2011-02-11 23:14+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -26,6 +26,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:356
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -90,7 +90,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:130
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:203
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:617
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:396
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:635
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
@@ -139,8 +139,8 @@
 #: ../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/Preferences.java:445
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:456
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:492
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:131
@@ -153,5 +153,5 @@
 #: ../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/TMSLayer.java:837
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:692
@@ -165,10 +165,10 @@
 #: ../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/gui/preferences/ProjectionPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1228
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1238
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:80
@@ -177,5 +177,5 @@
 #: ../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/plugins/PluginHandler.java:384
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:35
@@ -191,5 +191,4 @@
 #: ../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
@@ -237,6 +236,6 @@
 #: ../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
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:818
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
@@ -274,5 +273,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:32
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:504
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -345,15 +345,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:202
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
 #: ../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:202
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:205
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:211
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:222
@@ -390,10 +390,11 @@
 #: ../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/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/preferences/SourceEditor.java:668
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1373
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1374
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
@@ -492,5 +493,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:62
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -549,5 +550,4 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
 #: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:21
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -592,7 +592,7 @@
 #: ../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:507
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:983
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1012
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:528
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1001
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1030
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:43
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:40
@@ -618,4 +618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:68
 msgid "data"
 msgstr "data"
@@ -808,13 +809,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:103
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:118
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
-#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:22
 msgid "Create multipolygon"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:49
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 msgid "Create multipolygon."
 msgstr ""
@@ -822,5 +818,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:60
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:90
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:60
 msgid "No data loaded."
 msgstr "Ingen data lastet inn."
@@ -829,5 +824,4 @@
 #. and then splitting the way later (so there are multiple ways forming outer way)
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:69
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:69
 msgid "You must select at least one way."
 msgstr "Du må velge minst én linje."
@@ -844,5 +838,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:736
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:757
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:508
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -863,10 +857,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:200
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:202
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:204
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:205
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:211
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:102
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
@@ -875,5 +869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:105
 msgid "File exists. Overwrite?"
@@ -1081,5 +1075,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:159
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:31
 msgid "Adjust imagery offset"
@@ -1087,5 +1081,5 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:160
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -1120,5 +1114,5 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:165
 #, java-format
 msgid ""
@@ -1129,19 +1123,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:167
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:760
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:781
 msgid "Easting"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:169
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:760
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:781
 msgid "Northing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:172
 msgid "Bookmark name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:206
 msgid "Offset bookmark already exists. Overwrite?"
 msgstr ""
@@ -1192,5 +1186,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:689
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:710
 msgid "Please abort if you are not sure"
 msgstr "Angre hvis du er usikker"
@@ -1247,15 +1241,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1243
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1241
 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1253
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1251
 msgid ""
 "Sorry. Cannot handle way that is outer in multiple multipolygon relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1258
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1265
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1263
 msgid ""
 "Sorry. Cannot handle way that is both inner and outer in multipolygon "
@@ -1263,18 +1257,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1270
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1268
 msgid ""
 "Sorry. Cannot handle way that is inner in multiple multipolygon relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1372
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370
 msgid "Removed Element from Relations"
 msgstr "Fjernede Element fra Relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1443
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1438
 msgid "Remove tags from inner ways"
 msgstr "Fjern egenskaper fra indre linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1476
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1471
 msgid "Join Areas Function"
 msgstr "Funksjon Slå sammen Areal"
@@ -1752,22 +1746,22 @@
 
 #. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 msgid "Purge..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 msgid "Forget objects but do not delete them on server when uploading."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:62
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:196
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:196
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:227
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:221
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1776,5 +1770,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:229
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1782,9 +1776,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:260
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:274
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1792,5 +1786,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:280
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1846,5 +1840,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:216
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:217
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
@@ -2011,7 +2005,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:557
 #: ../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:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:91
 msgid "Yes"
@@ -2373,4 +2368,16 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:21
+msgid "Viewport Following"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:23
+msgid "Enable/disable automatic moving of the map view to last placed node"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:24
+msgid "Toggle Viewport Following"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23
 msgid "Wireframe View"
@@ -2630,5 +2637,5 @@
 msgstr "Modus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:247
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:245
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
@@ -2676,14 +2683,14 @@
 msgstr "Legg til node i linje og lag tilknytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:942
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 msgid "Create new node."
 msgstr "Lag ny node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976
 msgid "Select node under cursor."
 msgstr "Veg node under pekeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:954
 #, java-format
 msgid "Insert new node into way."
@@ -2692,14 +2699,14 @@
 msgstr[1] "Sett inn ny node i {0} linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
 msgid "Start new way from last node."
 msgstr "Start ny linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:966
 msgid "Continue way from last node."
 msgstr "Fortsett samme linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:984
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:989
 msgid "Finish drawing."
 msgstr "Avslutt tegning."
@@ -3672,31 +3679,31 @@
 msgstr "Korriger egenskap automatisk"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:84
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:88
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:83
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:87
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:149
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:148
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:154
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:153
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:176
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:175
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:239
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:238
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:269
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:268
 msgid "Restoring files"
 msgstr ""
@@ -3714,15 +3721,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:319
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:429
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Innstillingsfil har feil i linje {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
 #, java-format
 msgid ""
@@ -3731,5 +3738,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:443
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:444
 #, java-format
 msgid ""
@@ -3738,5 +3745,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
 #, java-format
 msgid ""
@@ -3745,5 +3752,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3752,5 +3759,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466
 #, java-format
 msgid ""
@@ -3758,5 +3765,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:470
 #, java-format
 msgid ""
@@ -3765,5 +3772,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:477
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
 #, java-format
 msgid ""
@@ -3772,5 +3779,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:490
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:491
 #, java-format
 msgid ""
@@ -3779,5 +3786,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -3877,5 +3884,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:69
+#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70
 #, java-format
 msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
@@ -3942,5 +3949,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:118
-#: ../plugins/multipoly/src/multipoly/Multipolygon.java:122
 #, java-format
 msgid "Cannot add a way with only {0} nodes."
@@ -3948,24 +3954,22 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:163
-#: ../plugins/multipoly/src/multipoly/Multipolygon.java:167
 msgid "Each node must connect exactly 2 ways"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:195
-#: ../plugins/multipoly/src/multipoly/Multipolygon.java:199
 msgid "There is an intersection between ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:455
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:457
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:543
 #, java-format
 msgid ""
@@ -3974,9 +3978,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:755
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1373
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1388
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3984,5 +3988,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1375
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1390
 #, java-format
 msgid ""
@@ -3992,5 +3996,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "node"
 msgid_plural "nodes"
@@ -4011,6 +4015,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:426
 msgid "relation"
 msgid_plural "relations"
@@ -4018,4 +4022,14 @@
 msgstr[1] "relasjoner"
 
+#. only for display, no real type
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
+msgid "closedway"
+msgstr "stengt_vei"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:16
+#, fuzzy
+msgid "multipolygon"
+msgstr "Multipolygon"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
@@ -4027,6 +4041,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:334
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:362
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:324
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:352
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -4268,4 +4282,6 @@
 #. * Error messages
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:14
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:518
 msgid "Errors"
 msgstr "Feilmeldinger"
@@ -4289,5 +4305,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:2346 build/trans_presets.java:5347
+#: build/trans_presets.java:1563 build/trans_presets.java:3419
 msgid "Other"
 msgstr "Annet"
@@ -4447,54 +4463,54 @@
 
 #. item "Relations/Multipolygon"
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:50
-#: build/trans_presets.java:6171
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
+#: build/trans_presets.java:4052
 msgid "Multipolygon"
 msgstr "Multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52
 msgid "This test checks if multipolygons are valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:119
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:134
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
 msgid "No outer way for multipolygon"
 msgstr "Ingen ytre linje i multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:156
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:158
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:186
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:188
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:202
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:204
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:208
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:213
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:215
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:235
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:237
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:238
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:240
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:249
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:251
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:252
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:254
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -4762,5 +4778,5 @@
 #: ../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:726
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:747
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:470
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
@@ -4779,5 +4795,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
@@ -4786,6 +4802,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/SourceEditor.java:719
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1057
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
@@ -4803,5 +4819,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:742
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:763
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
 msgid "Please select the row to delete."
@@ -5045,5 +5061,5 @@
 #. color building
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:104
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:221
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: build/trans_style.java:3564
@@ -5194,5 +5210,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #, java-format
 msgid " [id: {0}]"
@@ -5229,29 +5245,51 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:149
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:275
 msgid "incomplete"
 msgstr "uferdig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355
+#. I18n: name of house as parameter
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:171
+#, fuzzy, java-format
+msgid "House {0}"
+msgstr "Flytt {0}"
+
+#. I18n: house number, street as parameter, number should remain
+#. before street for better visibility
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178
+#, fuzzy, java-format
+msgid "House number {0} at {1}"
+msgstr "Husnummer"
+
+#. I18n: house number as parameter
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:126
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:182
+#, fuzzy, java-format
+msgid "House number {0}"
+msgstr "Husnummer"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:161
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:397
 msgid "highway"
 msgstr "ferdselsvei"
 
 #. item "Relations/Route" combo "Route type" display value
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:6248
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:162
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:398
+#: build/trans_presets.java:4105
 msgid "railway"
 msgstr "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:399
 msgid "waterway"
 msgstr "vannvei"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:400
 msgid "landuse"
 msgstr "bruk av grunn"
@@ -5259,6 +5297,7 @@
 #. note: length == 0 should no longer happen, but leave the bracket code
 #. nevertheless, who knows what future brings
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
+#. I18n: count of nodes as parameter
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:196
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:405
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
@@ -5271,10 +5310,10 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:265
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #, java-format
 msgid "{0} member"
@@ -5283,5 +5322,5 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:291
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5380,5 +5419,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
 msgid "Imagery"
 msgstr ""
@@ -5395,5 +5434,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:187
 msgctxt "layer"
 msgid "Offset"
@@ -5603,5 +5642,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:258
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:218
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:219
 msgid "Discard"
 msgstr ""
@@ -5623,5 +5662,5 @@
 msgstr "Innstilligen  {0} er fjernet fordi den ikke lenger brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -5629,17 +5668,16 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
 #: build/specialmessages.java:77
 msgid "View"
 msgstr "Vis"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
-#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:27
 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26
 msgid "Tools"
 msgstr "Verktøy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -5647,5 +5685,5 @@
 msgstr "Objektmaler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -5656,17 +5694,17 @@
 msgstr "Meny: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:335
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:343
 msgid "Audio"
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:263
+#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:267
 msgid "Hide this button"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:264
+#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:268
 msgid "Click the arrow at the bottom to show it again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:375
+#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:379
 msgid "Hide or show this toggle button"
 msgstr ""
@@ -5753,23 +5791,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:390
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:407
 msgid "Layer not in list."
 msgstr "Laget er ikke i lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:706
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:708
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1172
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1211
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1173
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1212
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1174
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1213
 msgid "Imperial"
 msgstr ""
@@ -6207,7 +6245,7 @@
 #: ../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/ImageryPreference.java:460
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:698
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:917
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:481
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:784
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1036
 #: ../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
@@ -6412,9 +6450,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:134
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:194
 msgid "Key"
 msgstr "Nøkkel"
@@ -6427,4 +6466,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
@@ -6432,5 +6472,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:118
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:134
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:194
 msgid "Value"
 msgstr "Verdi"
@@ -6519,5 +6559,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:6153
+#: build/trans_presets.java:4036
 msgid "all"
 msgstr "alle"
@@ -6774,5 +6814,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:185
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:194
 #: build/specialmessages.java:37
 msgid "Details"
@@ -6798,4 +6838,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:175
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:77
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -6809,5 +6850,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:129
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188
 #, java-format
 msgid "Toggle: {0}"
@@ -7034,5 +7075,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/SourceEditor.java:793
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:912
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
@@ -7044,5 +7085,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:328
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:241
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:367
 msgid "Show"
 msgstr "Vis"
@@ -7052,7 +7093,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:61
 msgid "Advanced object info"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+#, fuzzy
+msgid "map style"
+msgstr "Slott"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7122,5 +7168,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:571
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:486
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:507
 msgid "Activate"
 msgstr ""
@@ -7164,4 +7210,112 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:40
 msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:49
+msgid "Map Paint Styles"
+msgstr "Map Pain stiler"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:76
+msgid "configure the map painting style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164
+msgid "Authors"
+msgstr "Opphavsmenn"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:248
+msgid "Turn selected styles on or off"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:853
+#, fuzzy
+msgid "Move the selected entry one row down."
+msgstr "Flytt laget en rad ned."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:853
+#, fuzzy
+msgid "Move the selected entry one row up."
+msgstr "Flytt laget en rad opp."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:327
+#, fuzzy
+msgid "Reload from file"
+msgstr "Last ned kartbilder med feil på nytt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:328
+#, fuzzy
+msgid "reload selected styles from file"
+msgstr "les inn WMS lag fra fil"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:375
+#, fuzzy
+msgid "Save as..."
+msgstr "Lagre som …"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:376
+msgid "Save a copy of this Style to file and add it to the list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:417
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:186
+#, fuzzy
+msgid "Reloading style sources"
+msgstr "Kilder for objektmaler"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:430
+#, fuzzy, java-format
+msgid "Save style ''{0}'' as ''{1}''"
+msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:486
+msgid "view meta information, error log and source definition"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:497
+#, fuzzy
+msgid "Map Style info"
+msgstr "Innstillinger for kart"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:524
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
+msgid "Source"
+msgstr "Kilde"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:548
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:32
+#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:223
+msgid "Name:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:551
+#, fuzzy
+msgid "URL:"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:553
+msgid "Built-in Style, internal path:</b>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:555
+#, fuzzy
+msgid "Path:"
+msgstr "Sti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:557
+msgid "Style is currently active?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:557
+#: ../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:67
+msgid "No"
 msgstr ""
 
@@ -7170,5 +7324,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:6170
+#: build/trans_presets.java:4051
 msgid "Relations"
 msgstr "Relasjoner"
@@ -7309,10 +7463,4 @@
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klikk for at minimere/maksimere panelet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164
-msgid "Authors"
-msgstr "Opphavsmenn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
@@ -8546,182 +8694,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:760
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:781
 #: ../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: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
+#: build/trans_presets.java:153 build/trans_presets.java:195
+#: build/trans_presets.java:235 build/trans_presets.java:256
+#: build/trans_presets.java:275 build/trans_presets.java:294
+#: build/trans_presets.java:313 build/trans_presets.java:332
+#: build/trans_presets.java:353 build/trans_presets.java:388
+#: build/trans_presets.java:408 build/trans_presets.java:459
+#: build/trans_presets.java:479 build/trans_presets.java:494
+#: build/trans_presets.java:509 build/trans_presets.java:533
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:614 build/trans_presets.java:637
+#: build/trans_presets.java:657 build/trans_presets.java:677
+#: build/trans_presets.java:697 build/trans_presets.java:707
+#: build/trans_presets.java:718 build/trans_presets.java:780
+#: build/trans_presets.java:804 build/trans_presets.java:813
+#: build/trans_presets.java:874 build/trans_presets.java:1027
+#: build/trans_presets.java:1035 build/trans_presets.java:1043
+#: build/trans_presets.java:1051 build/trans_presets.java:1062
+#: build/trans_presets.java:1071 build/trans_presets.java:1077
+#: build/trans_presets.java:1085 build/trans_presets.java:1092
+#: build/trans_presets.java:1106 build/trans_presets.java:1113
+#: build/trans_presets.java:1118 build/trans_presets.java:1125
+#: build/trans_presets.java:1130 build/trans_presets.java:1136
+#: build/trans_presets.java:1143 build/trans_presets.java:1153
+#: build/trans_presets.java:1159 build/trans_presets.java:1165
+#: build/trans_presets.java:1170 build/trans_presets.java:1176
+#: build/trans_presets.java:1184 build/trans_presets.java:1193
+#: build/trans_presets.java:1200 build/trans_presets.java:1206
+#: build/trans_presets.java:1223 build/trans_presets.java:1230
+#: build/trans_presets.java:1237 build/trans_presets.java:1334
+#: build/trans_presets.java:1385 build/trans_presets.java:1391
+#: build/trans_presets.java:1397 build/trans_presets.java:1403
+#: build/trans_presets.java:1410 build/trans_presets.java:1416
+#: build/trans_presets.java:1421 build/trans_presets.java:1431
+#: build/trans_presets.java:1452 build/trans_presets.java:1484
+#: build/trans_presets.java:1494 build/trans_presets.java:1500
+#: build/trans_presets.java:1508 build/trans_presets.java:1524
+#: build/trans_presets.java:1533 build/trans_presets.java:1543
+#: build/trans_presets.java:1552 build/trans_presets.java:1576
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1602 build/trans_presets.java:1612
+#: build/trans_presets.java:1622 build/trans_presets.java:1642
+#: build/trans_presets.java:1654 build/trans_presets.java:1665
+#: build/trans_presets.java:1685 build/trans_presets.java:1700
+#: build/trans_presets.java:1708 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1817 build/trans_presets.java:1834
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1886 build/trans_presets.java:1908
+#: build/trans_presets.java:1927 build/trans_presets.java:1948
+#: build/trans_presets.java:1967 build/trans_presets.java:1984
+#: build/trans_presets.java:2003 build/trans_presets.java:2021
+#: build/trans_presets.java:2038 build/trans_presets.java:2055
+#: build/trans_presets.java:2071 build/trans_presets.java:2078
+#: build/trans_presets.java:2086 build/trans_presets.java:2093
+#: build/trans_presets.java:2110 build/trans_presets.java:2118
+#: build/trans_presets.java:2133 build/trans_presets.java:2143
+#: build/trans_presets.java:2155 build/trans_presets.java:2165
+#: build/trans_presets.java:2172 build/trans_presets.java:2179
+#: build/trans_presets.java:2185 build/trans_presets.java:2194
+#: build/trans_presets.java:2204 build/trans_presets.java:2209
+#: build/trans_presets.java:2217 build/trans_presets.java:2224
+#: build/trans_presets.java:2232 build/trans_presets.java:2241
+#: build/trans_presets.java:2248 build/trans_presets.java:2255
+#: build/trans_presets.java:2261 build/trans_presets.java:2269
+#: build/trans_presets.java:2279 build/trans_presets.java:2291
+#: build/trans_presets.java:2297 build/trans_presets.java:2304
+#: build/trans_presets.java:2312 build/trans_presets.java:2319
+#: build/trans_presets.java:2326 build/trans_presets.java:2334
+#: build/trans_presets.java:2341 build/trans_presets.java:2347
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2380 build/trans_presets.java:2390
+#: build/trans_presets.java:2396 build/trans_presets.java:2404
+#: build/trans_presets.java:2412 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2524
+#: build/trans_presets.java:2541 build/trans_presets.java:2556
+#: build/trans_presets.java:2565 build/trans_presets.java:2574
+#: build/trans_presets.java:2583 build/trans_presets.java:2592
+#: build/trans_presets.java:2598 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:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2684 build/trans_presets.java:2691
+#: build/trans_presets.java:2700 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:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2756
+#: build/trans_presets.java:2764 build/trans_presets.java:2773
+#: 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:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2848
+#: build/trans_presets.java:2854 build/trans_presets.java:2860
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2892
+#: build/trans_presets.java:2907 build/trans_presets.java:2914
+#: build/trans_presets.java:2922 build/trans_presets.java:2927
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2961 build/trans_presets.java:2971
+#: build/trans_presets.java:2978 build/trans_presets.java:2987
+#: build/trans_presets.java:2994 build/trans_presets.java:3001
+#: build/trans_presets.java:3007 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3034
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3062 build/trans_presets.java:3069
+#: build/trans_presets.java:3125 build/trans_presets.java:3131
+#: build/trans_presets.java:3139 build/trans_presets.java:3146
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3169
+#: build/trans_presets.java:3174 build/trans_presets.java:3179
+#: build/trans_presets.java:3188 build/trans_presets.java:3195
+#: build/trans_presets.java:3202 build/trans_presets.java:3210
+#: build/trans_presets.java:3217 build/trans_presets.java:3225
+#: build/trans_presets.java:3234 build/trans_presets.java:3242
+#: build/trans_presets.java:3251 build/trans_presets.java:3260
+#: build/trans_presets.java:3267 build/trans_presets.java:3275
+#: build/trans_presets.java:3281 build/trans_presets.java:3289
+#: build/trans_presets.java:3297 build/trans_presets.java:3304
+#: build/trans_presets.java:3311 build/trans_presets.java:3317
+#: build/trans_presets.java:3325 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3346
+#: build/trans_presets.java:3355 build/trans_presets.java:3361
+#: build/trans_presets.java:3369 build/trans_presets.java:3378
+#: build/trans_presets.java:3385 build/trans_presets.java:3391
+#: build/trans_presets.java:3400 build/trans_presets.java:3409
+#: build/trans_presets.java:3425 build/trans_presets.java:3434
+#: build/trans_presets.java:3442 build/trans_presets.java:3448
+#: build/trans_presets.java:3454 build/trans_presets.java:3462
+#: build/trans_presets.java:3471 build/trans_presets.java:3480
+#: build/trans_presets.java:3487 build/trans_presets.java:3495
+#: build/trans_presets.java:3502 build/trans_presets.java:3510
+#: build/trans_presets.java:3518 build/trans_presets.java:3526
+#: build/trans_presets.java:3535 build/trans_presets.java:3544
+#: build/trans_presets.java:3552 build/trans_presets.java:3560
+#: build/trans_presets.java:3567 build/trans_presets.java:3574
+#: build/trans_presets.java:3582 build/trans_presets.java:3589
+#: build/trans_presets.java:3597 build/trans_presets.java:3624
+#: build/trans_presets.java:3630 build/trans_presets.java:3636
+#: build/trans_presets.java:3642 build/trans_presets.java:3648
+#: build/trans_presets.java:3656 build/trans_presets.java:3663
+#: build/trans_presets.java:3670 build/trans_presets.java:3677
+#: build/trans_presets.java:3684 build/trans_presets.java:3692
+#: build/trans_presets.java:3700 build/trans_presets.java:3708
+#: build/trans_presets.java:3715 build/trans_presets.java:3722
+#: build/trans_presets.java:3731 build/trans_presets.java:3740
+#: build/trans_presets.java:3748 build/trans_presets.java:3756
+#: build/trans_presets.java:3764 build/trans_presets.java:3773
+#: build/trans_presets.java:3781 build/trans_presets.java:3791
+#: build/trans_presets.java:3801 build/trans_presets.java:3810
+#: build/trans_presets.java:3816 build/trans_presets.java:3822
+#: build/trans_presets.java:3828 build/trans_presets.java:3833
+#: build/trans_presets.java:3839 build/trans_presets.java:3849
+#: build/trans_presets.java:3855 build/trans_presets.java:3861
+#: build/trans_presets.java:3867 build/trans_presets.java:3874
+#: build/trans_presets.java:3881 build/trans_presets.java:3887
+#: build/trans_presets.java:3893 build/trans_presets.java:3900
+#: build/trans_presets.java:3906 build/trans_presets.java:3911
+#: build/trans_presets.java:3918 build/trans_presets.java:3925
+#: build/trans_presets.java:3931 build/trans_presets.java:3940
+#: build/trans_presets.java:3948 build/trans_presets.java:3954
+#: build/trans_presets.java:3960 build/trans_presets.java:3967
+#: build/trans_presets.java:3975 build/trans_presets.java:3981
+#: build/trans_presets.java:3988 build/trans_presets.java:3994
+#: build/trans_presets.java:4000 build/trans_presets.java:4006
+#: build/trans_presets.java:4012 build/trans_presets.java:4059
+#: build/trans_presets.java:4073 build/trans_presets.java:4092
+#: build/trans_presets.java:4106 build/trans_presets.java:4129
 msgid "Name"
 msgstr "Navn"
@@ -9144,7 +9292,7 @@
 #: ../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:152
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:151
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:155
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:215
 msgid "<different>"
 msgstr "<different>"
@@ -9889,5 +10037,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:145
 msgid "Bounds"
 msgstr ""
@@ -9961,12 +10109,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: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
+#: build/specialmessages.java:72 build/trans_presets.java:457
+#: build/trans_presets.java:753 build/trans_presets.java:762
+#: build/trans_presets.java:1154 build/trans_presets.java:1433
+#: build/trans_presets.java:1545 build/trans_presets.java:2281
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2935 build/trans_presets.java:3051
+#: build/trans_presets.java:3061 build/trans_presets.java:3792
+#: build/trans_presets.java:3802 build/trans_presets.java:3811
 msgid "Type"
 msgstr "Type"
@@ -10008,19 +10156,18 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../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: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
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+#: build/trans_presets.java:430 build/trans_presets.java:431
+#: build/trans_presets.java:432 build/trans_presets.java:433
+#: build/trans_presets.java:434 build/trans_presets.java:435
+#: build/trans_presets.java:436 build/trans_presets.java:437
+#: build/trans_presets.java:438 build/trans_presets.java:439
+#: build/trans_presets.java:520 build/trans_presets.java:521
+#: build/trans_presets.java:522 build/trans_presets.java:553
+#: build/trans_presets.java:598 build/trans_presets.java:731
+#: build/trans_presets.java:753 build/trans_presets.java:1365
+#: build/trans_presets.java:1438 build/trans_presets.java:1439
+#: build/trans_presets.java:1440 build/trans_presets.java:2197
+#: build/trans_presets.java:2531 build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "unknown"
 msgstr "ukjent"
@@ -10600,6 +10747,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:625
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1234
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:701
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1353
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -10625,10 +10772,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java:83
 msgid "Clear the list of recently opened files"
-msgstr ""
-
-#: ../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:66
-msgid "No"
 msgstr ""
 
@@ -10840,21 +10981,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: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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:781
+#: build/trans_presets.java:116 build/trans_presets.java:134
+#: build/trans_presets.java:154 build/trans_presets.java:174
+#: build/trans_presets.java:196 build/trans_presets.java:214
+#: build/trans_presets.java:236 build/trans_presets.java:257
+#: build/trans_presets.java:283 build/trans_presets.java:302
+#: build/trans_presets.java:321 build/trans_presets.java:340
+#: build/trans_presets.java:361 build/trans_presets.java:395
+#: build/trans_presets.java:415 build/trans_presets.java:465
+#: build/trans_presets.java:480 build/trans_presets.java:495
+#: build/trans_presets.java:519 build/trans_presets.java:557
+#: build/trans_presets.java:577 build/trans_presets.java:599
+#: build/trans_presets.java:622 build/trans_presets.java:646
+#: build/trans_presets.java:665 build/trans_presets.java:685
+#: build/trans_presets.java:1028 build/trans_presets.java:1036
+#: build/trans_presets.java:1044 build/trans_presets.java:1052
+#: build/trans_presets.java:1063 build/trans_presets.java:1340
 msgid "Layer"
 msgstr "Lag"
@@ -10895,5 +11036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:277
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -11314,5 +11455,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/SourceEditor.java:571
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:642
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
@@ -11335,5 +11476,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
-#: build/trans_presets.java:6254
+#: build/trans_presets.java:4109
 msgid "Description"
 msgstr "Beskrivelse"
@@ -11622,5 +11763,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:171
+#, fuzzy
+msgid "(use server offset)"
+msgstr "Proxy-tjenerens vert"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:243
 msgid "ERROR"
 msgstr ""
@@ -11735,76 +11881,76 @@
 msgstr[1] "{0} punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:326
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:329
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:340
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:349
 msgid "Load Tile"
 msgstr "Last Kartbilde"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:360
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:383
 msgid "Load All Tiles"
 msgstr "Hent alle kartbilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:393
 msgid "Increase zoom"
 msgstr "Zoom inn"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:399
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:402
 msgid "Decrease zoom"
 msgstr "Zoom ut"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:410
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:413
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:424
 msgid "Flush Tile Cache"
 msgstr "Tøm bildehurtiglager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:829
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:832
 msgid "image "
 msgstr "bilde "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1222
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1225
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1227
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1229
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1233
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1233
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1236
 #, java-format
 msgid "Current zoom: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1234
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1237
 #, java-format
 msgid "Display zoom: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1238
 #, java-format
 msgid "Pixel scale: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1239
 #, java-format
 msgid "Best zoom: {0}"
@@ -12418,5 +12564,7 @@
 msgstr "Feil ved visning av URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:110
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:154
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:50
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76
 #, java-format
 msgid ""
@@ -12424,22 +12572,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:114
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:215
+#, fuzzy, java-format
+msgid "loading style ''{0}''..."
+msgstr "Åpner fil ''{0}'' ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java:73
+#, java-format
+msgid ""
+"There was an error when loading this style. Select ''Info'' from the right "
+"click menu for details."
+msgid_plural ""
+"There were {0} errors when loading this style. Select ''Info'' from the "
+"right click menu for details."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84
+#, 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:64
+msgid "Illegal dash pattern, values must be positive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java:72
+msgid "Illegal dash pattern, at least one value must be > 0"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80
 #, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
 "{3}"
-msgstr ""
-
-#: ../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 ""
 
@@ -13029,22 +13195,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:79
 msgid "Unnamed WMS Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:82
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:558
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:579
 msgid "Menu Name"
 msgstr "Meny Navn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:85
 msgid "Service URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:90
 msgid "Get Layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:127
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:128
 msgid ""
 "That layer does not support any of JOSM's projections,\n"
@@ -13052,34 +13218,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:267
+msgid "WMS Error"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:163
+msgid "Show Bounds"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:266
-msgid "WMS Error"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:154
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:162
-msgid "Show Bounds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:164
 msgid "No bounding box was found for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:173
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:226
 msgid "Could not parse WMS layer list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:248
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:266
 msgid "Could not retrieve WMS layer list."
 msgstr ""
@@ -13306,5 +13472,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:111
 #, java-format
 msgid "Choose a color for {0}"
@@ -13342,5 +13508,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:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173
 msgid "None"
@@ -13375,5 +13541,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:1425
 msgid "Car"
 msgstr "Bil"
@@ -13397,13 +13563,13 @@
 #. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: 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
+#: build/trans_presets.java:432 build/trans_presets.java:551
+#: build/trans_presets.java:830 build/trans_presets.java:849
+#: build/trans_presets.java:863 build/trans_presets.java:885
+#: build/trans_presets.java:922 build/trans_presets.java:935
+#: build/trans_presets.java:947 build/trans_presets.java:959
+#: build/trans_presets.java:971 build/trans_presets.java:983
+#: build/trans_presets.java:993 build/trans_presets.java:1002
+#: build/trans_presets.java:1011 build/trans_presets.java:1571
+#: build/trans_presets.java:1644
 msgid "Bicycle"
 msgstr "Sykkel"
@@ -13438,12 +13604,12 @@
 #. item "Barriers/Sally Port" check "Foot"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: 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
+#: build/trans_presets.java:433 build/trans_presets.java:550
+#: build/trans_presets.java:829 build/trans_presets.java:848
+#: build/trans_presets.java:862 build/trans_presets.java:884
+#: build/trans_presets.java:921 build/trans_presets.java:934
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:992 build/trans_presets.java:1001
+#: build/trans_presets.java:1010
 msgid "Foot"
 msgstr "Til fots"
@@ -13660,171 +13826,175 @@
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:111
 msgid "imagery fade"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:122
 msgid "Fade Color: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:126
 msgid "Fade amount: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:126
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:132
 msgid "Soft"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:127
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:133
 msgid "Strong"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:134
 msgid "Sharpen (requires layer re-add): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:139
 msgid "WMSPlugin/SlippyMap settings migration"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:160
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:155
+msgid "Use offset server: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:177
 msgid "Downloader:"
 msgstr "Nedlaster:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:183
 msgid "Overlap tiles"
 msgstr "Overlapp kartbilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:184
 msgid "% of east:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:185
 msgid "% of north:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:200
 msgid "Simultaneous connections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:199
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:216
 msgid "Auto zoom by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:220
 msgid "Autoload tiles by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:224
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:228
 msgid "Max zoom lvl: "
 msgstr "Max zoom niv: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:215
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:232
 msgid "Add to slippymap chooser: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:236
 msgid "Tile cache directory: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:258
 msgid "Common Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
 msgid "WMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:243
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:260
 msgid "TMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:269
 msgid "Imagery Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:269
 msgid "Modify list of imagery layers displayed in the Imagery menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276
 msgid "Imagery providers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:278
 msgid "Offset bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:396
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:417
 msgid "Available default entries:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:422
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:443
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:461
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:757
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1023
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
 msgid "New"
 msgstr "Ny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:441
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:462
 msgid "add a new wms/tms entry by entering the url"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:470
 msgid "Add Imagery URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:461
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:482
 msgid "remove entry"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:487
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:508
 msgid "copy selected defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:506
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:527
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:543
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
 msgid "reload defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:558
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:579
 msgid "Imagery URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:558
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:579
 msgctxt "layer"
 msgid "Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:637
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:658
 msgid "Menu Name (Default)"
 msgstr "Meny Navn (Standard)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:637
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:658
 msgid "Imagery URL (Default)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:680
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:701
 #, java-format
 msgid "EULA license URL not available: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:694
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:715
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:760
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:781
 msgid "Projection"
 msgstr ""
@@ -13939,59 +14109,47 @@
 msgstr "Standard (automatisk valgt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:42
-msgid "Enable built-in defaults"
-msgstr "Benytt innebygd standardverdier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:38
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
-msgid "Used style"
-msgstr "Brukt stil"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:74
-msgid "Map Paint Styles"
-msgstr "Map Pain stiler"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:112
 msgid "Available styles:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:114
 msgid "Active styles:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:116
 msgid "Add a new style by entering filename or URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:118
 msgid "New style entry:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:120
 msgid "Remove the selected styles from the list of active styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:147
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:122
 msgid "Edit the filename or URL for the selected active style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:124
 msgid "Add the selected available styles to the list of active styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:126
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:128
 #, java-format
 msgid "Loading style sources from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:130
 #, java-format
 msgid ""
@@ -14000,14 +14158,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:137
 #, 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244
 msgid "Internal Style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245
 msgid "Internal style to be used as base for runtime switchable overlay styles"
 msgstr ""
@@ -14060,8 +14218,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:321
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:343
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:274
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:747
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:916
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:765
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:934
 msgid "Update plugins"
 msgstr ""
@@ -14297,26 +14455,25 @@
 msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:139
 msgid "Projection method"
 msgstr "Projeksjonsmetode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:152
 msgid "Display coordinates as"
 msgstr "Vis koordinater som"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:155
 msgid "System of measurement"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
 msgid "Map Projection"
 msgstr "Kartprojeksjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:220
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -14422,29 +14579,29 @@
 msgstr "Hurtigtast"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:313
 msgid "Icon paths:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:563
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:634
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Kort beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:563
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:634
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:565
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:636
 #, java-format
 msgid "Author: {0}"
 msgstr "Opphavsperson: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:568
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:639
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Nettside: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:645
 #, java-format
 msgid "Version: {0}"
@@ -14453,49 +14610,54 @@
 #. 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:668
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:601
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:673
 msgid "Name (optional):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:605
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:677
 msgid "URL / File:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:741
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:691
+#, fuzzy
+msgid "active"
+msgstr "inaktiv"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:827
 msgid "Edit source entry:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:780
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:899
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:373
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
 msgid "Reset"
 msgstr "Reset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:781
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:900
 msgid "Reset to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:905
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1024
 msgid "Add a new icon path"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1037
 msgid "Remove the selected icon paths"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:939
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1058
 msgid "Edit the selected icon path"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:65
 #, java-format
 msgid "Warning: Could not read tagging preset source: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68
 #, java-format
 msgid ""
@@ -14505,10 +14667,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94
 #, java-format
 msgid ""
@@ -14518,5 +14680,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98
 #, java-format
 msgid ""
@@ -14525,5 +14687,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:104
 #, java-format
 msgid ""
@@ -14532,5 +14694,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
 #, java-format
 msgid ""
@@ -14539,51 +14701,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:139
 msgid "Sort presets menu"
 msgstr "Meny for sortering av innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:147
 msgid "Tagging Presets"
 msgstr "Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:211
 msgid "Available presets:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:213
 msgid "Active presets:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:215
 msgid "Add a new preset by entering filename or URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:217
 msgid "New preset entry:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:219
 msgid "Remove the selected presets from the list of active presets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:220
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:221
 msgid "Edit the filename or URL for the selected active preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:223
 msgid "Add the selected available presets to the list of active presets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:225
 #, java-format
 msgid "Reloads the list of available presets from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:227
 #, java-format
 msgid "Loading preset sources from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:228
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:229
 #, java-format
 msgid ""
@@ -14592,14 +14754,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:236
 #, 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:331
 msgid "Internal Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:332
 msgid "The default preset for JOSM"
 msgstr ""
@@ -14994,6 +15156,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:446
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:709
 #, java-format
 msgid ""
@@ -15002,6 +15164,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:717
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:714
 #, java-format
 msgid ""
@@ -15010,49 +15172,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:889
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:907
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Mer informasjon om denne funksjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:944
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1001
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:984
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1002
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1003
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:986
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1004
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1001
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1019
 msgid "Optional Attributes:"
 msgstr "Valgfrie attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1117
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1186
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1176
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1194
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1227
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -15062,15 +15224,15 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1219
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1237
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1260
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1278
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1341
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1359
 #: ../plugins/terracer/src/terracer/TerracerAction.java:213
 #, java-format
@@ -15080,22 +15242,22 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1344
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1362
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1346
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1364
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../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/TaggingPreset.java:1373
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1374
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1355
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1373
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1444
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1462
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15456,10 +15618,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:70
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:78
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:116
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:124
 #, java-format
 msgid ""
@@ -15720,8 +15882,5 @@
 #: ../plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java:121
 #: ../plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java:136
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:96
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:104
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:125
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:135
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:97
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -15841,7 +16000,5 @@
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:100
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:139
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:91
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:121
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:131
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:92
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -16140,5 +16297,5 @@
 #: ../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
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:222
 #, java-format
 msgid "Line {0} column {1}: "
@@ -16298,4 +16455,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
+#, java-format
+msgid "Querying offset availability: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:32
+#, java-format
+msgid "Offset server response: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:45
+#, java-format
+msgid "Querying offset: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:103
 #, java-format
@@ -16324,4 +16496,18 @@
 "Kartprojeksjonen «{0}» i URL og valgt kartprojeksjon «{1}» passer ikke.\n"
 "Dette resulterer i feil koordinater."
+
+#: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
+#, fuzzy
+msgid "Add tags to selected objects"
+msgstr "Egenskaper for valgte objekt."
+
+#: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
+#, fuzzy
+msgid "Add tags"
+msgstr "Rediger egenskaper"
+
+#: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
+msgid "Assume"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java:36
@@ -16343,9 +16529,9 @@
 msgstr "Remote Control har bedt om data fra denne URL:"
 
-#: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java:43
+#: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java:46
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control er bedt om å laste data fra API."
 
-#: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java:44
+#: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java:47
 #, java-format
 msgid "Request details: {0}"
@@ -16427,5 +16613,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:186
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:204
 msgid "The following plugin is no longer necessary and has been deactivated:"
 msgid_plural ""
@@ -16434,5 +16620,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:240
 #, java-format
 msgid ""
@@ -16442,5 +16628,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "You updated your JOSM software.<br>To prevent problems the plugins should be "
@@ -16448,22 +16634,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Siste oppdaterte programtillegg for {0} dager siden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:276
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
 msgid "Click to update the activated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
 msgid "Skip update"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
 msgid "Click to skip updating the activated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 msgid ""
 "Skipping plugin update after JOSM upgrade. Automatic update at startup is "
@@ -16471,5 +16657,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317
 msgid ""
 "Skipping plugin update after elapsed update interval. Automatic update at "
@@ -16477,5 +16663,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:324
 msgid ""
 "Running plugin update after JOSM upgrade. Automatic update at startup is "
@@ -16483,5 +16669,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:308
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:326
 msgid ""
 "Running plugin update after elapsed update interval. Automatic update at "
@@ -16489,5 +16675,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:332
 #, java-format
 msgid ""
@@ -16495,5 +16681,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:352
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
 #, java-format
 msgid ""
@@ -16505,5 +16691,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392
 #, java-format
 msgid ""
@@ -16512,15 +16698,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:460
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:478
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:464
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:471
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:489
 #, java-format
 msgid ""
@@ -16529,18 +16715,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:493
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:511
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:494
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:512
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:521
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:539
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:602
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:620
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -16548,5 +16734,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:610
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:628
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -16554,17 +16740,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:636
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:654
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:642
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:660
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:662
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:686
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -16572,5 +16758,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:679
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:697
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -16582,42 +16768,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:687
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:705
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:723
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:727
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:741
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:804
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:887
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:822
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:905
 msgid "Disable plugin"
 msgstr "Fjern programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:791
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:809
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:893
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:911
 msgid "Keep plugin"
 msgstr "Behold programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:797
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:895
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:815
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:913
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:871
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:889
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:872
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:878
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:896
 #, java-format
 msgid ""
@@ -16626,5 +16812,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:877
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:895
 #, java-format
 msgid ""
@@ -16633,10 +16819,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:889
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:907
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:902
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:920
 #, java-format
 msgid ""
@@ -16644,10 +16830,10 @@
 msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:905
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:923
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "I følge nformasjon i tilleggsprogram, er {0} opphavsmann."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:908
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:926
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -16655,9 +16841,9 @@
 "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:910
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:928
 msgid "Should the plugin be disabled?"
 msgstr "Skal programtillegget fjernes?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1000
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -16667,14 +16853,14 @@
 "lese programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1024
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1042
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1029
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1047
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "ingen beskrivelse tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1061
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1079
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -16707,26 +16893,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:90
 msgid "Processing plugin site cache files..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:113
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:137
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:143
 #, java-format
 msgid "Processing file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:92
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:147
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:98
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:153
 #, java-format
 msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:115
 msgid "Processing plugin site cache icon files..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:133
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:139
 msgid "Processing plugin files..."
 msgstr ""
@@ -16787,13 +16973,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
 msgid "Report Bug"
 msgstr "Rapporter feil"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -16802,9 +16988,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:82
 msgid "Unexpected Exception"
 msgstr "En uventet unntakstilstand"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:115
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:114
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -16812,5 +16998,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:119
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:118
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -16818,5 +17004,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -16825,5 +17011,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -16831,9 +17017,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:134
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:149
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -17034,5 +17220,5 @@
 msgstr "Fant ikke oversettelsen for {0}. Bruker {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:76
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:82
 #, java-format
 msgid ""
@@ -17041,11 +17227,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:197
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:271
 #, java-format
 msgid ""
@@ -17359,5 +17545,5 @@
 #. item "Ways/Path" combo "Visibility"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:125
-#: build/trans_presets.java:884
+#: build/trans_presets.java:543
 msgid "Visibility"
 msgstr ""
@@ -17622,5 +17808,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:6123
+#: build/trans_presets.java:4017
 msgid "Addresses"
 msgstr "Adresser"
@@ -17640,5 +17826,5 @@
 #. item "Places/Country"
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
-#: build/trans_presets.java:5699
+#: build/trans_presets.java:3659
 msgid "Country"
 msgstr "Land"
@@ -17648,5 +17834,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:5728
+#: build/trans_presets.java:3688
 msgid "City"
 msgstr "Storby"
@@ -17667,5 +17853,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:1186
+#: build/trans_presets.java:698
 msgid "Number"
 msgstr "Nummer"
@@ -17821,5 +18007,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:6145
+#: build/trans_presets.java:4031
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -18464,5 +18650,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:4647 build/trans_style.java:812
+#: build/trans_presets.java:2935 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
@@ -18565,8 +18751,4 @@
 "html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
-msgid "Source"
-msgstr "Kilde"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
@@ -19229,32 +19411,4 @@
 msgstr "Fant ikke GPX lag"
 
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:63
-#, java-format
-msgid "Current projection is set to {0}"
-msgstr ""
-
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:65
-msgid ""
-"\n"
-"Please adjust WMS layer manually by using known exact objects/traces/... "
-"before starting to map"
-msgstr ""
-
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:90
-msgid "EPSG31287"
-msgstr ""
-
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:96
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:109
-#, java-format
-msgid "set {0}"
-msgstr ""
-
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:98
-#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:111
-#, java-format
-msgid "set projection from {0} to {1}"
-msgstr ""
-
 #: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:59
 msgid "dx"
@@ -19286,10 +19440,4 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
-msgstr ""
-
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:32
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:223
-msgid "Name:"
 msgstr ""
 
@@ -20241,232 +20389,232 @@
 msgstr "Firefox-programfil"
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:105
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106
 msgid "Transform error: Min X must be smaller than max"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:109
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110
 msgid "Transform error: Min Y must be smaller than max"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:115
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116
 msgid "Transform error: Points too close"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:128
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:141
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142
 msgid "Transform error: Unsupported variant."
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:189
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190
 msgid "Transform error: Unsupported orientation"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:90
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:91
 msgid "Finished"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:214
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:215
 msgid "Load file..."
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:215
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:216
 msgid "Place"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:217
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:218
 msgid "Show target"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:226
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:232
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:227
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:233
 msgid "Take X and Y from selected node"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:234
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:235
 msgid "Debug info"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:235
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:236
 msgid "Merge close nodes"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:238
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:239
 msgid "Remove objects smaller than"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:241
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:242
 msgid "Remove objects larger than"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:245
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:246
 msgid "Only this color"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:249
 msgid "Remove parallel lines"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:251
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:252
 msgid "Take only first X paths"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:254
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:255
 msgid "Color/width change"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:255
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:256
 msgid "Shape closed"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:256
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:257
 msgid "Single segments"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:257
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:258
 msgid "Orthogonal shapes"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:260
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:261
 msgid "Import settings"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:305
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:306
 msgid "Introduce separate layers for:"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:317
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:318
 msgid "Bind to coordinates"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:320
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:321
 msgid "Projection:"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:325
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:326
 msgid "Bottom left (min) corner:"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:327
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:345
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:328
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:346
 msgid "PDF X and Y"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:329
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:347
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:330
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:348
 msgid "East and North"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:343
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:344
 msgid "Top right (max) corner:"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:395
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:396
 msgid "Loading..."
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:407
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:408
 msgid "PDF file preview"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:422
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:423
 msgid "Loaded"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:464
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:465
 msgid "Imported PDF: "
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:555
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:556
 msgid "Please select exactly one node."
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:578
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:579
 msgid "PDF files"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:604
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:605
 msgid "OSM files"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:640
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:641
 msgid "Preparing"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:654
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:750
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:766
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:655
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:751
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:767
 msgid "Tolerance is not a number"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:668
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:669
 msgid "Could not parse color"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:681
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:682
 msgid "Could not parse max path count"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:688
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:689
 msgid "Parsing file"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:700
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:701
 msgid "File not found."
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:707
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:708
 #, java-format
 msgid "Error while parsing: {0}"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:716
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:717
 msgid "Removing parallel segments"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:723
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:724
 msgid "Max distance is not a number"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:730
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:731
 msgid "Joining nodes"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:735
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:736
 msgid "Joining adjacent segments"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:742
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:743
 msgid "Removing small objects"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:759
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:760
 msgid "Removing large objects"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:772
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:773
 msgid "Finalizing layers"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:787
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:788
 msgid "Please set a projection."
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:809
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:810
 msgid "Could not parse numbers. Please check."
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:868
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:869
 msgid "Building JOSM layer"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:872
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:873
 msgid "Postprocessing layer"
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:896
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:897
 msgid "Saving to file."
 msgstr ""
 
-#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:902
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:903
 msgid " Writing to file"
 msgstr ""
@@ -20642,9 +20790,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:125
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:131
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -20692,5 +20840,5 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:28
 msgid "PicLayer"
@@ -20721,4 +20869,13 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureShearAction.java:45
+#, fuzzy
+msgid "Shear"
+msgstr "Søk"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureShearAction.java:45
+msgid "Resets picture shear"
+msgstr ""
+
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
 msgid "PicLayer rotate"
@@ -20768,4 +20925,13 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "Drag to scale the picture in the Y Axis"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ShearPictureAction.java:57
+#, fuzzy
+msgid "PicLayer shear"
+msgstr "Lag"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ShearPictureAction.java:57
+msgid "Drag to shear the picture"
 msgstr ""
 
@@ -20791,5 +20957,5 @@
 #. group "Public Transport"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:1594
 msgid "Public Transport"
 msgstr "Offentlig transport"
@@ -20836,5 +21002,5 @@
 #. group "Waypoints"
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:691
 msgid "Waypoints"
 msgstr "Veipunkt"
@@ -21619,5 +21785,5 @@
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java:246
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java:252
 msgid "GPG"
 msgstr ""
@@ -21678,70 +21844,56 @@
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:37
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "UID"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:37
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "KeyID"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:37
-msgid "OSM-Cert"
-msgstr ""
-
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:37
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
+#, fuzzy
+msgid "OSM-Info"
+msgstr "Info"
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "Signed"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:64
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:82
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:66
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:84
 msgid "Unknown"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:128
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:129
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:187
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188
 msgid "Object signatures"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:128
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:187
 msgid "Open object signing window."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:233
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:359
 msgid "Check"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:234
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:360
 msgid "Check all available signatures for selected object."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:237
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:363
 msgid "Sign"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:238
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:364
 msgid "Digital sign selected Tags, if you believe they are correct."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:242
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:368
 msgid "Show all available signatures for selected attribute."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:54
-msgid "Sorry, there are no Signatures for the selected Attribute."
-msgstr ""
-
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:54
-msgid "No Signature found"
-msgstr ""
-
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:57
-#, java-format
-msgid ""
-"Selected key value pair was:\n"
-"{0}={1}"
-msgstr ""
-
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:67
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:46
 #, java-format
 msgid "Signed key value pair was: {0}={1}"
@@ -21753,21 +21905,50 @@
 #. //signerPanel.add(new JLabel(tr("Signature created at {0} by User {1}",formatter.format(s.getCreationTime()),s.getHashedSubPackets().getSignerUserID())),GBC.eol());
 #. }
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:105
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:108
 #, java-format
 msgid "{0} Signatures found."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:130
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:117
 msgid "Signature Info"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:166
-msgid "Key Signatures"
-msgstr ""
-
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:222
-#, java-format
-msgid "Key certified for OSM-Usage with comment:{0}"
-msgstr ""
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:126
+#, fuzzy
+msgid "Sorry, there are no Signatures for the selected Node."
+msgstr "Lag en sirkel fra tre valgte noder."
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:126
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:136
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:145
+msgid "No Signature found"
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:129
+#, fuzzy, java-format
+msgid ""
+"Selected node was:\n"
+"{0}"
+msgstr "Valgt spor: {0}"
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:136
+msgid "Sorry, there are no Signatures for the selected Attribute."
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:138
+#, java-format
+msgid ""
+"Selected key value pair was:\n"
+"{0}={1}"
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:145
+msgid "Sorry, there are no Signatures for the selected Segment."
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:147
+#, fuzzy
+msgid "Selected WaySegment was:"
+msgstr "Velg mållag."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/preferences/TrustPreferenceEditor.java:26
@@ -21816,42 +21997,42 @@
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:98
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:99
 #, java-format
 msgid "Only digits allowed in osmid: ''{0}''."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:157
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:137
 msgid "Could not parse OpenPGP message."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:220
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:209
 msgid "Prepare stuff..."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:221
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:210
 msgid "Parsing Signature data..."
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:173
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:182
 msgid "Select a signing key from your keyring-file:"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:181
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:190
 msgid "Don't ask again for the key"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:196
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:205
 msgid "Use a random key from this list"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:202
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:211
 msgid "Create new Key"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:235
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:244
 msgid "Select a Key to sign"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:365
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:351
 #, java-format
 msgid ""
@@ -21861,37 +22042,76 @@
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:365
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:351
 msgid "Signing canceled!"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:549
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:469
+#, fuzzy
+msgid "Please give a tolerance in meters"
+msgstr "Velg en verdi."
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:476
+#, fuzzy
+msgid "meters"
+msgstr "{0} meter"
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:478
+msgid "Accuracy"
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:490
+msgid "Select as much as you like:"
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:492
+#, fuzzy
+msgid "Survey"
+msgstr "Surveyor"
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:495
+msgid "Aerial Photography"
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:498
+msgid "Web Recherche"
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:501
+msgid "Trusted persons told me"
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:504
+msgid "Which source did you use?"
+msgstr ""
+
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:657
 msgid "never"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:555
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Primary user-ID: "
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:555
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Key-ID: "
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:555
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Fingerprint: "
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:555
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Algorithm: "
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:555
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Strength in bit: "
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:555
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Creation date: "
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:555
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Expiration date: "
 msgstr ""
@@ -21906,25 +22126,25 @@
 #. sp.setPreferredSize(new Dimension(0,200));
 #. metaPanel.add(sp);
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:584
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:692
 msgid "PGP-Key details"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:649
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "User-ID:"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:649
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "Select algorithm:"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:649
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "Choose Bitlength (Strength):"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:649
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "Encryption algorithm to protect private key:"
 msgstr ""
 
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:649
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "Choose an expiry date for the key:"
 msgstr ""
@@ -21933,5 +22153,5 @@
 #. initX, initY
 #. xPad, yPad
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:669
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:777
 msgid "Create a new signing key"
 msgstr ""
@@ -22790,10 +23010,10 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:81
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:82
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:103
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:104
 msgid "Shows current position in the video"
 msgstr ""
@@ -23617,13 +23837,6 @@
 msgstr ""
 
-#. Plugin multipoly
+#. Plugin nearclick
 #: build/trans_plugins.java:69
-msgid ""
-"Create multipolygons by one click, much easier than standard way with "
-"relation editor."
-msgstr ""
-
-#. Plugin nearclick
-#: build/trans_plugins.java:71
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -23636,15 +23849,15 @@
 
 #. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:71
+msgid "extended options for editing opening_hours"
+msgstr ""
+
+#. Plugin openstreetbugs
 #: build/trans_plugins.java:73
-msgid "extended options for editing opening_hours"
-msgstr ""
-
-#. Plugin openstreetbugs
-#: build/trans_plugins.java:75
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer tema fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:75
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -23652,5 +23865,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:77
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -23658,10 +23871,10 @@
 
 #. Plugin pdfimport
+#: build/trans_plugins.java:79
+msgid "Import PDF file and convert to ways."
+msgstr ""
+
+#. Plugin photo_geotagging
 #: build/trans_plugins.java:81
-msgid "Import PDF file and convert to ways."
-msgstr ""
-
-#. Plugin photo_geotagging
-#: build/trans_plugins.java:83
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -23670,5 +23883,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:83
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -23679,31 +23892,31 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:85
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
+#: build/trans_plugins.java:87
+msgid ""
+"This plugin simplifies the mapping and editing of public transport routes."
+msgstr ""
+
+#. Plugin restart
 #: build/trans_plugins.java:89
-msgid ""
-"This plugin simplifies the mapping and editing of public transport routes."
-msgstr ""
-
-#. Plugin restart
+msgid "Adds &quot;Restart JOSM&quot; item to File menu."
+msgstr ""
+
+#. Plugin reverter
 #: build/trans_plugins.java:91
-msgid "Adds &quot;Restart JOSM&quot; item to File menu."
-msgstr ""
-
-#. Plugin reverter
+msgid "Plugin for reverting changesets"
+msgstr ""
+
+#. Plugin rgisopen
 #: build/trans_plugins.java:93
-msgid "Plugin for reverting changesets"
-msgstr ""
-
-#. Plugin rgisopen
+msgid "Use rgis.spb.ru image as overlay"
+msgstr ""
+
+#. Plugin RoadSigns
 #: build/trans_plugins.java:95
-msgid "Use rgis.spb.ru image as overlay"
-msgstr ""
-
-#. Plugin RoadSigns
-#: build/trans_plugins.java:97
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -23713,5 +23926,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:97
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -23722,15 +23935,15 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:99
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. Plugin scripting
+#: build/trans_plugins.java:101
+msgid "Allows to run scripts in JOSM."
+msgstr ""
+
+#. Plugin SimplifyArea
 #: build/trans_plugins.java:103
-msgid "Allows to run scripts in JOSM."
-msgstr ""
-
-#. Plugin SimplifyArea
-#: build/trans_plugins.java:105
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -23740,20 +23953,20 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:107 build/trans_plugins.java:109
+#: build/trans_plugins.java:105 build/trans_plugins.java:107
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr ""
 
 #. Plugin surveyor
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:109
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:111
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:113
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -23766,15 +23979,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:115
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin SeaMapEditor
+#: build/trans_plugins.java:117
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
+#. Plugin touchscreenhelper
 #: build/trans_plugins.java:119
-msgid "Create and edit seamarks for OpenSeaMap"
-msgstr ""
-
-#. Plugin touchscreenhelper
-#: build/trans_plugins.java:121
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -23783,5 +23996,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:121
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -23790,10 +24003,10 @@
 
 #. Plugin trustosm
+#: build/trans_plugins.java:123
+msgid "Plugin to digital sign OSM-Data"
+msgstr ""
+
+#. Plugin turnrestrictions
 #: build/trans_plugins.java:125
-msgid "Plugin to digital sign OSM-Data"
-msgstr ""
-
-#. Plugin turnrestrictions
-#: build/trans_plugins.java:127
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -23802,15 +24015,15 @@
 
 #. Plugin undelete
+#: build/trans_plugins.java:127
+msgid "Allows undeleting object from OSM database"
+msgstr ""
+
+#. Plugin utilsplugin2
 #: build/trans_plugins.java:129
-msgid "Allows undeleting object from OSM database"
-msgstr ""
-
-#. Plugin utilsplugin2
+msgid "Several utilities that make your life easier."
+msgstr ""
+
+#. Plugin videomapping
 #: build/trans_plugins.java:131
-msgid "Several utilities that make your life easier."
-msgstr ""
-
-#. Plugin videomapping
-#: build/trans_plugins.java:133
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -23820,5 +24033,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:133
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -23827,20 +24040,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:135
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin waypoint_search
+#: build/trans_plugins.java:137
+msgid "Enables searching for waypoint imported from gpx file."
+msgstr ""
+
+#. Plugin wayselector
 #: build/trans_plugins.java:139
-msgid "Enables searching for waypoint imported from gpx file."
-msgstr ""
-
-#. Plugin wayselector
+msgid "Select a sequence of non-branching connected ways"
+msgstr ""
+
+#. Plugin wms-turbo-challenge2
 #: build/trans_plugins.java:141
-msgid "Select a sequence of non-branching connected ways"
-msgstr ""
-
-#. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:143
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -23993,11 +24206,11 @@
 #. item "Power/Cable Distribution Cabinet" text "Reference"
 #. item "Relations/Route" text "Reference"
-#: 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
+#: build/trans_presets.java:113 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:193
+#: build/trans_presets.java:233 build/trans_presets.java:254
+#: build/trans_presets.java:1721 build/trans_presets.java:1729
+#: build/trans_presets.java:1737 build/trans_presets.java:1771
+#: build/trans_presets.java:3071 build/trans_presets.java:3087
+#: build/trans_presets.java:4107
 msgid "Reference"
 msgstr "Veinummer"
@@ -24011,8 +24224,8 @@
 #. item "Highways/Streets/Secondary" combo "Lanes"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
-#: 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
+#: build/trans_presets.java:117 build/trans_presets.java:135
+#: build/trans_presets.java:155 build/trans_presets.java:175
+#: build/trans_presets.java:197 build/trans_presets.java:215
+#: build/trans_presets.java:237 build/trans_presets.java:466
 msgid "Lanes"
 msgstr "Kjørebaner"
@@ -24036,13 +24249,13 @@
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
-#: 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
+#: build/trans_presets.java:118 build/trans_presets.java:136
+#: build/trans_presets.java:156 build/trans_presets.java:176
+#: build/trans_presets.java:198 build/trans_presets.java:216
+#: build/trans_presets.java:238 build/trans_presets.java:258
+#: build/trans_presets.java:284 build/trans_presets.java:363
+#: build/trans_presets.java:397 build/trans_presets.java:418
+#: build/trans_presets.java:440 build/trans_presets.java:481
+#: build/trans_presets.java:496 build/trans_presets.java:558
+#: build/trans_presets.java:578 build/trans_presets.java:1342
 msgid "Max. speed (km/h)"
 msgstr "Fartsgrense (km/t)"
@@ -24081,17 +24294,17 @@
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
-#: 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
+#: build/trans_presets.java:119 build/trans_presets.java:137
+#: build/trans_presets.java:157 build/trans_presets.java:177
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:239 build/trans_presets.java:259
+#: build/trans_presets.java:276 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:334
+#: build/trans_presets.java:354 build/trans_presets.java:376
+#: build/trans_presets.java:389 build/trans_presets.java:409
+#: build/trans_presets.java:427 build/trans_presets.java:460
+#: build/trans_presets.java:518 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:616 build/trans_presets.java:639
+#: build/trans_presets.java:679 build/trans_presets.java:1335
 msgid "Oneway"
 msgstr "Enveiskjøring"
@@ -24132,18 +24345,18 @@
 #. </button>
 #. <button label="Bridge" hotkey="B" type="toggle">
-#: 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
+#: build/trans_presets.java:120 build/trans_presets.java:138
+#: build/trans_presets.java:159 build/trans_presets.java:179
+#: build/trans_presets.java:201 build/trans_presets.java:219
+#: build/trans_presets.java:240 build/trans_presets.java:260
+#: build/trans_presets.java:277 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:335
+#: build/trans_presets.java:355 build/trans_presets.java:390
+#: build/trans_presets.java:410 build/trans_presets.java:461
+#: build/trans_presets.java:470 build/trans_presets.java:477
+#: build/trans_presets.java:513 build/trans_presets.java:544
+#: build/trans_presets.java:572 build/trans_presets.java:593
+#: build/trans_presets.java:617 build/trans_presets.java:640
+#: build/trans_presets.java:659 build/trans_presets.java:680
+#: build/trans_presets.java:1336 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -24176,17 +24389,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: 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
+#: build/trans_presets.java:121 build/trans_presets.java:139
+#: build/trans_presets.java:160 build/trans_presets.java:180
+#: build/trans_presets.java:202 build/trans_presets.java:220
+#: build/trans_presets.java:241 build/trans_presets.java:261
+#: build/trans_presets.java:278 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:336
+#: build/trans_presets.java:356 build/trans_presets.java:391
+#: build/trans_presets.java:411 build/trans_presets.java:462
+#: build/trans_presets.java:486 build/trans_presets.java:514
+#: build/trans_presets.java:545 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:618
+#: build/trans_presets.java:641 build/trans_presets.java:660
+#: build/trans_presets.java:681 build/trans_presets.java:1337
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -24217,17 +24430,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: 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
+#: build/trans_presets.java:122 build/trans_presets.java:140
+#: build/trans_presets.java:161 build/trans_presets.java:181
+#: build/trans_presets.java:203 build/trans_presets.java:221
+#: build/trans_presets.java:242 build/trans_presets.java:262
+#: build/trans_presets.java:279 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:337
+#: build/trans_presets.java:357 build/trans_presets.java:392
+#: build/trans_presets.java:412 build/trans_presets.java:463
+#: build/trans_presets.java:515 build/trans_presets.java:546
+#: build/trans_presets.java:574 build/trans_presets.java:595
+#: build/trans_presets.java:619 build/trans_presets.java:642
+#: build/trans_presets.java:661 build/trans_presets.java:682
+#: build/trans_presets.java:1338
 msgid "Cutting"
 msgstr "Skjæring"
@@ -24258,17 +24471,17 @@
 #. item "Ways/Steps" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
-#: 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
+#: build/trans_presets.java:123 build/trans_presets.java:141
+#: build/trans_presets.java:162 build/trans_presets.java:182
+#: build/trans_presets.java:204 build/trans_presets.java:222
+#: build/trans_presets.java:243 build/trans_presets.java:263
+#: build/trans_presets.java:280 build/trans_presets.java:300
+#: build/trans_presets.java:319 build/trans_presets.java:338
+#: build/trans_presets.java:358 build/trans_presets.java:393
+#: build/trans_presets.java:413 build/trans_presets.java:464
+#: build/trans_presets.java:516 build/trans_presets.java:547
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:620 build/trans_presets.java:643
+#: build/trans_presets.java:662 build/trans_presets.java:683
+#: build/trans_presets.java:1339
 msgid "Embankment"
 msgstr "Øy"
@@ -24298,16 +24511,16 @@
 #. item "Ways/Dedicated Footway" check "Lit"
 #. item "Ways/Steps" check "Lit"
-#: 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
+#: build/trans_presets.java:124 build/trans_presets.java:142
+#: build/trans_presets.java:163 build/trans_presets.java:183
+#: build/trans_presets.java:205 build/trans_presets.java:223
+#: build/trans_presets.java:244 build/trans_presets.java:264
+#: build/trans_presets.java:281 build/trans_presets.java:301
+#: build/trans_presets.java:320 build/trans_presets.java:339
+#: build/trans_presets.java:359 build/trans_presets.java:378
+#: build/trans_presets.java:394 build/trans_presets.java:414
+#: build/trans_presets.java:517 build/trans_presets.java:548
+#: build/trans_presets.java:576 build/trans_presets.java:597
+#: build/trans_presets.java:621 build/trans_presets.java:644
+#: build/trans_presets.java:663 build/trans_presets.java:684
 msgid "Lit"
 msgstr ""
@@ -24315,5 +24528,5 @@
 #. </optional>
 #. item "Highways/Streets/Motorway Link"
-#: build/trans_presets.java:129
+#: build/trans_presets.java:127
 msgid "Motorway Link"
 msgstr "Av-/påkjørsel for motorvei"
@@ -24322,5 +24535,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:132
+#: build/trans_presets.java:130
 msgid "Edit Motorway Link"
 msgstr "rediger av-/påkjørsel for motorvei"
@@ -24328,5 +24541,5 @@
 #. </optional>
 #. item "Highways/Streets/Trunk"
-#: build/trans_presets.java:149
+#: build/trans_presets.java:145
 msgid "Trunk"
 msgstr "Stamvei"
@@ -24335,5 +24548,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
 #. item "Highways/Streets/Trunk" label "Edit Trunk"
-#: build/trans_presets.java:152
+#: build/trans_presets.java:148
 msgid "Edit Trunk"
 msgstr "Rediger stamvei"
@@ -24343,6 +24556,6 @@
 #. item "Highways/Streets/Primary" check "Motorroad"
 #. item "Highways/Streets/Primary Link" check "Motorroad"
-#: build/trans_presets.java:164 build/trans_presets.java:186
-#: build/trans_presets.java:210 build/trans_presets.java:230
+#: build/trans_presets.java:158 build/trans_presets.java:178
+#: build/trans_presets.java:200 build/trans_presets.java:218
 msgid "Motorroad"
 msgstr "Motorsykkel"
@@ -24350,5 +24563,5 @@
 #. </optional>
 #. item "Highways/Streets/Trunk Link"
-#: build/trans_presets.java:172
+#: build/trans_presets.java:166
 msgid "Trunk Link"
 msgstr "Av-/påkjørsel for stamvei"
@@ -24357,5 +24570,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:175
+#: build/trans_presets.java:169
 msgid "Edit Trunk Link"
 msgstr "Rediger av-/påkjørsel for stamvei"
@@ -24368,5 +24581,5 @@
 #. </button>
 #. <button label="Primary" hotkey="2">
-#: build/trans_presets.java:195 build/trans_surveyor.java:76
+#: build/trans_presets.java:187 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Riksvei"
@@ -24375,5 +24588,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
 #. item "Highways/Streets/Primary" label "Edit Primary Road"
-#: build/trans_presets.java:198
+#: build/trans_presets.java:190
 msgid "Edit Primary Road"
 msgstr "Rediger riksvei"
@@ -24381,5 +24594,5 @@
 #. </optional>
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:218
+#: build/trans_presets.java:208
 msgid "Primary Link"
 msgstr "Av-/påkjørsel for riksvei"
@@ -24387,5 +24600,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:220
+#: build/trans_presets.java:210
 msgid "Edit Primary Link"
 msgstr "Rediger av-/påkjørsel for riksvei"
@@ -24397,5 +24610,5 @@
 #. </button>
 #. <button label="Secondary" hotkey="3">
-#: build/trans_presets.java:238 build/trans_surveyor.java:80
+#: build/trans_presets.java:226 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Fylkesvei e.l."
@@ -24405,5 +24618,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
 #. item "Highways/Streets/Secondary" label "Edit Secondary Road"
-#: build/trans_presets.java:242
+#: build/trans_presets.java:230
 msgid "Edit Secondary Road"
 msgstr "Rediger fylkesvei e.l."
@@ -24411,5 +24624,5 @@
 #. </optional>
 #. item "Highways/Streets/Tertiary"
-#: build/trans_presets.java:261
+#: build/trans_presets.java:247
 msgid "Tertiary"
 msgstr "Kommunal vei"
@@ -24419,5 +24632,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
 #. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
-#: build/trans_presets.java:265
+#: build/trans_presets.java:251
 msgid "Edit Tertiary Road"
 msgstr "Rediger kommunal vei"
@@ -24429,5 +24642,5 @@
 #. </button>
 #. <button label="Unclassified" hotkey="4">
-#: build/trans_presets.java:282 build/trans_surveyor.java:84
+#: build/trans_presets.java:267 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Småvei"
@@ -24437,5 +24650,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
 #. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
-#: build/trans_presets.java:286
+#: build/trans_presets.java:271
 msgid "Edit Unclassified Road"
 msgstr "Rediger småvei"
@@ -24445,6 +24658,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Dedicated Footway" check "Passing Places"
-#: build/trans_presets.java:297 build/trans_presets.java:431
-#: build/trans_presets.java:1098 build/trans_presets.java:1134
+#: build/trans_presets.java:282 build/trans_presets.java:360
+#: build/trans_presets.java:645 build/trans_presets.java:664
 msgid "Passing Places"
 msgstr "Passeringspunkter"
@@ -24471,15 +24684,15 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: 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
+#: build/trans_presets.java:285 build/trans_presets.java:304
+#: build/trans_presets.java:323 build/trans_presets.java:342
+#: build/trans_presets.java:364 build/trans_presets.java:398
+#: build/trans_presets.java:419 build/trans_presets.java:467
+#: build/trans_presets.java:483 build/trans_presets.java:497
+#: build/trans_presets.java:523 build/trans_presets.java:559
+#: build/trans_presets.java:579 build/trans_presets.java:600
+#: build/trans_presets.java:623 build/trans_presets.java:647
+#: build/trans_presets.java:666 build/trans_presets.java:686
+#: build/trans_presets.java:1343 build/trans_presets.java:1632
+#: build/trans_presets.java:1677
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
@@ -24491,5 +24704,5 @@
 #. </button>
 #. <button label="Residential" hotkey="5">
-#: build/trans_presets.java:304 build/trans_surveyor.java:88
+#: build/trans_presets.java:288 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Boligfeltvei"
@@ -24498,5 +24711,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
 #. item "Highways/Streets/Residential" label "Edit Residential Street"
-#: build/trans_presets.java:307
+#: build/trans_presets.java:291
 msgid "Edit Residential Street"
 msgstr "Rediger boligfeltvei"
@@ -24518,12 +24731,12 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:511
+#: build/trans_presets.java:541 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:1341
 msgid "Surface"
 msgstr "Veidekke"
@@ -24545,12 +24758,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:511
+#: build/trans_presets.java:541 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:1341
 msgid "paved"
 msgstr "fast dekke"
@@ -24571,12 +24784,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:541
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:615 build/trans_presets.java:638
+#: build/trans_presets.java:658 build/trans_presets.java:678
+#: build/trans_presets.java:1341
 msgid "unpaved"
 msgstr "uten fast dekke"
@@ -24597,12 +24810,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:541
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:615 build/trans_presets.java:638
+#: build/trans_presets.java:658 build/trans_presets.java:678
+#: build/trans_presets.java:1341
 msgid "asphalt"
 msgstr ""
@@ -24624,12 +24837,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:511
+#: build/trans_presets.java:541 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:1341
 msgid "concrete"
 msgstr "betong"
@@ -24651,12 +24864,12 @@
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Facilities/Bench" combo "Material" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:541
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:615 build/trans_presets.java:638
+#: build/trans_presets.java:658 build/trans_presets.java:678
+#: build/trans_presets.java:1341 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -24679,13 +24892,13 @@
 #. item "Leisure/Public Grill" combo "Fuel" display value
 #. item "Facilities/Bench" combo "Material" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:541
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:615 build/trans_presets.java:638
+#: build/trans_presets.java:658 build/trans_presets.java:678
+#: build/trans_presets.java:1341 build/trans_presets.java:2219
+#: build/trans_presets.java:2517
 msgid "wood"
 msgstr "skogsområde"
@@ -24706,12 +24919,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:541
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:615 build/trans_presets.java:638
+#: build/trans_presets.java:658 build/trans_presets.java:678
+#: build/trans_presets.java:1341
 msgid "paving_stones"
 msgstr ""
@@ -24733,12 +24946,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:511
+#: build/trans_presets.java:541 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:1341
 msgid "cobblestone"
 msgstr "brostein"
@@ -24760,12 +24973,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:511
+#: build/trans_presets.java:541 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:1341
 msgid "gravel"
 msgstr "grus"
@@ -24786,12 +24999,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:541
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:615 build/trans_presets.java:638
+#: build/trans_presets.java:658 build/trans_presets.java:678
+#: build/trans_presets.java:1341
 msgid "pebblestone"
 msgstr ""
@@ -24812,12 +25025,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:541
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:615 build/trans_presets.java:638
+#: build/trans_presets.java:658 build/trans_presets.java:678
+#: build/trans_presets.java:1341
 msgid "compacted"
 msgstr ""
@@ -24838,12 +25051,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:541
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:615 build/trans_presets.java:638
+#: build/trans_presets.java:658 build/trans_presets.java:678
+#: build/trans_presets.java:1341
 msgid "grass_paver"
 msgstr ""
@@ -24865,12 +25078,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:511
+#: build/trans_presets.java:541 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:1341
 msgid "grass"
 msgstr "gress"
@@ -24892,12 +25105,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:511
+#: build/trans_presets.java:541 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:1341
 msgid "sand"
 msgstr "sand"
@@ -24920,13 +25133,13 @@
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Facilities/Clock" combo "Support" display value
-#: 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
+#: build/trans_presets.java:303 build/trans_presets.java:322
+#: build/trans_presets.java:341 build/trans_presets.java:362
+#: build/trans_presets.java:377 build/trans_presets.java:396
+#: build/trans_presets.java:416 build/trans_presets.java:511
+#: build/trans_presets.java:541 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:1341
+#: build/trans_presets.java:2487
 msgid "ground"
 msgstr "jord"
@@ -24934,5 +25147,5 @@
 #. </optional>
 #. item "Highways/Streets/Living Street"
-#: build/trans_presets.java:340
+#: build/trans_presets.java:307
 msgid "Living Street"
 msgstr "Gatetun"
@@ -24941,5 +25154,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:343
+#: build/trans_presets.java:310
 msgid "Edit Living Street"
 msgstr "Rediger gatetun"
@@ -24947,5 +25160,5 @@
 #. </optional>
 #. item "Highways/Streets/Pedestrian"
-#: build/trans_presets.java:376
+#: build/trans_presets.java:326
 msgid "Pedestrian"
 msgstr "Gågate"
@@ -24954,5 +25167,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
 #. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
-#: build/trans_presets.java:379
+#: build/trans_presets.java:329
 msgid "Edit Pedestrian Street"
 msgstr "Rediger gågate"
@@ -24960,5 +25173,5 @@
 #. </optional>
 #. item "Highways/Streets/Service"
-#: build/trans_presets.java:412
+#: build/trans_presets.java:345
 msgid "Service"
 msgstr "Adkomstvei"
@@ -24967,5 +25180,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
 #. item "Highways/Streets/Service" label "Edit Serviceway"
-#: build/trans_presets.java:415
+#: build/trans_presets.java:348
 msgid "Edit Serviceway"
 msgstr "Rediger adkomstvei"
@@ -24975,20 +25188,20 @@
 #. <optional>
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:419
+#: build/trans_presets.java:352
 msgid "Serviceway type"
 msgstr "Type adkomstvei"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:420
+#: build/trans_presets.java:352
 msgid "alley"
 msgstr "Smug"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:421
+#: build/trans_presets.java:352
 msgid "driveway"
 msgstr "Oppkjørsel"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:422
+#: build/trans_presets.java:352
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -24996,5 +25209,5 @@
 #. </optional>
 #. item "Highways/Streets/Parking Aisle"
-#: build/trans_presets.java:455
+#: build/trans_presets.java:367
 msgid "Parking Aisle"
 msgstr "Parkeringsvei"
@@ -25004,5 +25217,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:459
+#: build/trans_presets.java:371
 msgid "Edit Parking Aisle"
 msgstr "Rediger parkeringsvei"
@@ -25010,5 +25223,5 @@
 #. </optional>
 #. item "Highways/Streets/Road (Unknown Type)"
-#: build/trans_presets.java:485
+#: build/trans_presets.java:381
 msgid "Road (Unknown Type)"
 msgstr "Vei (ukjent type)"
@@ -25017,5 +25230,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:488
+#: build/trans_presets.java:384
 msgid "Edit Road of unknown type"
 msgstr "Rediger vei av ukjent type"
@@ -25023,15 +25236,15 @@
 #. </optional>
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:522
+#: build/trans_presets.java:401
 msgid "Construction"
 msgstr "Veiarbeid"
 
 #. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
-#: build/trans_presets.java:523
+#: build/trans_presets.java:402
 msgid "Edit Highway Under Construction"
 msgstr "Rediger vei under bygging"
 
 #. item "Highways/Streets/Construction" combo "Junction"
-#: build/trans_presets.java:555
+#: build/trans_presets.java:417
 msgid "Junction"
 msgstr "Kryss"
@@ -25077,5 +25290,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:556 build/trans_style.java:739
+#: build/trans_presets.java:417 build/trans_style.java:739
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -25084,5 +25297,5 @@
 #. <separator/>
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:563
+#: build/trans_presets.java:423
 msgid "Road Restrictions"
 msgstr "Restriksjoner"
@@ -25091,15 +25304,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
-#: build/trans_presets.java:566
+#: build/trans_presets.java:426
 msgid "Edit Road Restrictions"
 msgstr "Rediger restriksjoner"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:568
+#: build/trans_presets.java:428
 msgid "Toll"
 msgstr "Avgift"
 
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
-#: build/trans_presets.java:569
+#: build/trans_presets.java:429
 msgid "No exit (cul-de-sac)"
 msgstr "Ingen gjennomkjøring"
@@ -25108,6 +25321,6 @@
 #. item "Ways/Track" combo "Access"
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:570 build/trans_presets.java:801
-#: build/trans_presets.java:3387
+#: build/trans_presets.java:430 build/trans_presets.java:520
+#: build/trans_presets.java:2197
 msgid "Access"
 msgstr "Adkomst"
@@ -25233,64 +25446,64 @@
 #. item "Facilities/Hunting Stand" combo "Lock" display value
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe" display value
-#: 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
+#: build/trans_presets.java:430 build/trans_presets.java:431
+#: build/trans_presets.java:432 build/trans_presets.java:433
+#: build/trans_presets.java:434 build/trans_presets.java:435
+#: build/trans_presets.java:436 build/trans_presets.java:437
+#: build/trans_presets.java:438 build/trans_presets.java:439
+#: build/trans_presets.java:477 build/trans_presets.java:520
+#: build/trans_presets.java:521 build/trans_presets.java:522
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:553
+#: build/trans_presets.java:554 build/trans_presets.java:555
+#: build/trans_presets.java:556 build/trans_presets.java:598
+#: build/trans_presets.java:762 build/trans_presets.java:1251
+#: build/trans_presets.java:1263 build/trans_presets.java:1275
+#: build/trans_presets.java:1287 build/trans_presets.java:1299
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1434 build/trans_presets.java:1435
+#: build/trans_presets.java:1438 build/trans_presets.java:1439
+#: build/trans_presets.java:1440 build/trans_presets.java:1455
+#: build/trans_presets.java:1546 build/trans_presets.java:1558
+#: build/trans_presets.java:1559 build/trans_presets.java:1560
+#: build/trans_presets.java:1561 build/trans_presets.java:1562
+#: build/trans_presets.java:1666 build/trans_presets.java:1667
+#: build/trans_presets.java:1668 build/trans_presets.java:1786
+#: build/trans_presets.java:1787 build/trans_presets.java:1788
+#: build/trans_presets.java:1789 build/trans_presets.java:1804
+#: build/trans_presets.java:1805 build/trans_presets.java:1806
+#: build/trans_presets.java:1807 build/trans_presets.java:1820
+#: build/trans_presets.java:1821 build/trans_presets.java:1822
+#: build/trans_presets.java:1823 build/trans_presets.java:1837
+#: build/trans_presets.java:1838 build/trans_presets.java:1839
+#: build/trans_presets.java:1840 build/trans_presets.java:1855
+#: build/trans_presets.java:1856 build/trans_presets.java:1857
+#: build/trans_presets.java:1858 build/trans_presets.java:1872
+#: build/trans_presets.java:1873 build/trans_presets.java:1874
+#: build/trans_presets.java:1875 build/trans_presets.java:1889
+#: build/trans_presets.java:1890 build/trans_presets.java:1891
+#: build/trans_presets.java:1892 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1912
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1934 build/trans_presets.java:1935
+#: build/trans_presets.java:1936 build/trans_presets.java:1937
+#: build/trans_presets.java:1953 build/trans_presets.java:1954
+#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1970 build/trans_presets.java:1971
+#: build/trans_presets.java:1972 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:1990
+#: build/trans_presets.java:1991 build/trans_presets.java:1992
+#: build/trans_presets.java:2008 build/trans_presets.java:2009
+#: build/trans_presets.java:2010 build/trans_presets.java:2011
+#: build/trans_presets.java:2024 build/trans_presets.java:2025
+#: build/trans_presets.java:2026 build/trans_presets.java:2027
+#: build/trans_presets.java:2041 build/trans_presets.java:2042
+#: build/trans_presets.java:2043 build/trans_presets.java:2044
+#: build/trans_presets.java:2058 build/trans_presets.java:2059
+#: build/trans_presets.java:2137 build/trans_presets.java:2147
+#: build/trans_presets.java:2197 build/trans_presets.java:2218
+#: build/trans_presets.java:2403 build/trans_presets.java:2458
+#: build/trans_presets.java:2459 build/trans_presets.java:2516
+#: build/trans_presets.java:2531 build/trans_presets.java:2532
+#: build/trans_presets.java:2533 build/trans_presets.java:2954
 msgid "yes"
 msgstr "ja"
@@ -25314,11 +25527,11 @@
 #. <condition k="access" v="private"/>
 #. color private
-#: 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
+#: build/trans_presets.java:430 build/trans_presets.java:432
+#: build/trans_presets.java:433 build/trans_presets.java:434
+#: build/trans_presets.java:435 build/trans_presets.java:436
+#: build/trans_presets.java:437 build/trans_presets.java:438
+#: build/trans_presets.java:439 build/trans_presets.java:520
+#: build/trans_presets.java:521 build/trans_presets.java:522
+#: build/trans_presets.java:2197 build/trans_style.java:175
 msgid "private"
 msgstr "privat"
@@ -25341,10 +25554,10 @@
 #. <condition k="access" v="destination"/>
 #. color destination
-#: 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_presets.java:430 build/trans_presets.java:431
+#: build/trans_presets.java:432 build/trans_presets.java:433
+#: build/trans_presets.java:434 build/trans_presets.java:435
+#: build/trans_presets.java:437 build/trans_presets.java:438
+#: build/trans_presets.java:439 build/trans_presets.java:520
+#: build/trans_presets.java:521 build/trans_presets.java:522
 #: build/trans_style.java:180
 msgid "destination"
@@ -25378,11 +25591,11 @@
 #. <condition k="access" v="permissive"/>
 #. color permissive
-#: 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_presets.java:430 build/trans_presets.java:431
+#: build/trans_presets.java:432 build/trans_presets.java:433
+#: build/trans_presets.java:434 build/trans_presets.java:435
+#: build/trans_presets.java:436 build/trans_presets.java:437
+#: build/trans_presets.java:438 build/trans_presets.java:439
+#: build/trans_presets.java:520 build/trans_presets.java:521
+#: build/trans_presets.java:522 build/trans_presets.java:2197
 #: build/trans_style.java:170
 msgid "permissive"
@@ -25397,8 +25610,8 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: 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
+#: build/trans_presets.java:430 build/trans_presets.java:434
+#: build/trans_presets.java:435 build/trans_presets.java:437
+#: build/trans_presets.java:438 build/trans_presets.java:520
+#: build/trans_presets.java:521 build/trans_presets.java:522
 msgid "agricultural"
 msgstr "Skog- og Landbruk"
@@ -25412,8 +25625,8 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: 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
+#: build/trans_presets.java:430 build/trans_presets.java:434
+#: build/trans_presets.java:435 build/trans_presets.java:437
+#: build/trans_presets.java:438 build/trans_presets.java:520
+#: build/trans_presets.java:521 build/trans_presets.java:522
 msgid "forestry"
 msgstr ""
@@ -25428,9 +25641,9 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: 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
+#: build/trans_presets.java:430 build/trans_presets.java:431
+#: build/trans_presets.java:434 build/trans_presets.java:435
+#: build/trans_presets.java:437 build/trans_presets.java:438
+#: build/trans_presets.java:520 build/trans_presets.java:521
+#: build/trans_presets.java:522
 msgid "delivery"
 msgstr "leveranse"
@@ -25559,71 +25772,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: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
+#: build/trans_presets.java:430 build/trans_presets.java:431
+#: build/trans_presets.java:432 build/trans_presets.java:433
+#: build/trans_presets.java:434 build/trans_presets.java:435
+#: build/trans_presets.java:436 build/trans_presets.java:437
+#: build/trans_presets.java:438 build/trans_presets.java:439
+#: build/trans_presets.java:520 build/trans_presets.java:521
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:553
+#: build/trans_presets.java:554 build/trans_presets.java:555
+#: build/trans_presets.java:556 build/trans_presets.java:598
+#: build/trans_presets.java:731 build/trans_presets.java:753
+#: build/trans_presets.java:1251 build/trans_presets.java:1263
+#: build/trans_presets.java:1275 build/trans_presets.java:1287
+#: build/trans_presets.java:1299 build/trans_presets.java:1311
+#: build/trans_presets.java:1323 build/trans_presets.java:1365
+#: build/trans_presets.java:1434 build/trans_presets.java:1435
+#: build/trans_presets.java:1438 build/trans_presets.java:1439
+#: build/trans_presets.java:1440 build/trans_presets.java:1455
+#: build/trans_presets.java:1546 build/trans_presets.java:1558
+#: build/trans_presets.java:1559 build/trans_presets.java:1560
+#: build/trans_presets.java:1561 build/trans_presets.java:1562
+#: build/trans_presets.java:1666 build/trans_presets.java:1667
+#: build/trans_presets.java:1668 build/trans_presets.java:1786
+#: build/trans_presets.java:1787 build/trans_presets.java:1788
+#: build/trans_presets.java:1789 build/trans_presets.java:1804
+#: build/trans_presets.java:1805 build/trans_presets.java:1806
+#: build/trans_presets.java:1807 build/trans_presets.java:1820
+#: build/trans_presets.java:1821 build/trans_presets.java:1822
+#: build/trans_presets.java:1823 build/trans_presets.java:1837
+#: build/trans_presets.java:1838 build/trans_presets.java:1839
+#: build/trans_presets.java:1840 build/trans_presets.java:1855
+#: build/trans_presets.java:1856 build/trans_presets.java:1857
+#: build/trans_presets.java:1858 build/trans_presets.java:1872
+#: build/trans_presets.java:1873 build/trans_presets.java:1874
+#: build/trans_presets.java:1875 build/trans_presets.java:1889
+#: build/trans_presets.java:1890 build/trans_presets.java:1891
+#: build/trans_presets.java:1892 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1912
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1934 build/trans_presets.java:1935
+#: build/trans_presets.java:1936 build/trans_presets.java:1937
+#: build/trans_presets.java:1953 build/trans_presets.java:1954
+#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1970 build/trans_presets.java:1971
+#: build/trans_presets.java:1972 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:1990
+#: build/trans_presets.java:1991 build/trans_presets.java:1992
+#: build/trans_presets.java:2008 build/trans_presets.java:2009
+#: build/trans_presets.java:2010 build/trans_presets.java:2011
+#: build/trans_presets.java:2024 build/trans_presets.java:2025
+#: build/trans_presets.java:2026 build/trans_presets.java:2027
+#: build/trans_presets.java:2041 build/trans_presets.java:2042
+#: build/trans_presets.java:2043 build/trans_presets.java:2044
+#: build/trans_presets.java:2058 build/trans_presets.java:2059
+#: build/trans_presets.java:2137 build/trans_presets.java:2147
+#: build/trans_presets.java:2218 build/trans_presets.java:2403
+#: build/trans_presets.java:2458 build/trans_presets.java:2459
+#: build/trans_presets.java:2516 build/trans_presets.java:2531
+#: build/trans_presets.java:2532 build/trans_presets.java:2533
+#: build/trans_presets.java:2954 build/trans_presets.java:3037
+#: build/trans_presets.java:3038
 msgid "no"
 msgstr "nei"
 
 #. item "Highways/Streets/Road Restrictions" combo "Agricultural"
-#: build/trans_presets.java:581
+#: build/trans_presets.java:431
 msgid "Agricultural"
 msgstr ""
@@ -25647,13 +25860,13 @@
 #. item "Ways/Path" combo "Snowmobile" display value
 #. item "Ways/Path" combo "Motorcar" display value
-#: 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
+#: build/trans_presets.java:431 build/trans_presets.java:432
+#: build/trans_presets.java:433 build/trans_presets.java:434
+#: build/trans_presets.java:435 build/trans_presets.java:436
+#: build/trans_presets.java:437 build/trans_presets.java:438
+#: build/trans_presets.java:439 build/trans_presets.java:520
+#: build/trans_presets.java:521 build/trans_presets.java:522
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:554
+#: build/trans_presets.java:555 build/trans_presets.java:556
 msgid "designated"
 msgstr "brukertype"
@@ -25675,22 +25888,22 @@
 #. item "Ways/Path" combo "Ski" display value
 #. item "Ways/Path" combo "Snowmobile" display value
-#: 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
+#: build/trans_presets.java:432 build/trans_presets.java:433
+#: build/trans_presets.java:434 build/trans_presets.java:435
+#: build/trans_presets.java:436 build/trans_presets.java:437
+#: build/trans_presets.java:438 build/trans_presets.java:439
+#: build/trans_presets.java:520 build/trans_presets.java:521
+#: build/trans_presets.java:522 build/trans_presets.java:550
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:554 build/trans_presets.java:555
 msgid "official"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Goods"
-#: build/trans_presets.java:610
+#: build/trans_presets.java:434
 msgid "Goods"
 msgstr "Varer"
 
 #. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:435
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung last (hgv)"
@@ -25707,10 +25920,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: 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
+#: build/trans_presets.java:436 build/trans_presets.java:552
+#: build/trans_presets.java:831 build/trans_presets.java:864
+#: build/trans_presets.java:886 build/trans_presets.java:923
+#: build/trans_presets.java:936 build/trans_presets.java:948
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:1012
 msgid "Horse"
 msgstr "Hest"
@@ -25729,11 +25942,11 @@
 #. item "Barriers/Sally Port" check "Motorcycle"
 #. group "Motorcycle"
-#: 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
+#: build/trans_presets.java:437 build/trans_presets.java:521
+#: build/trans_presets.java:832 build/trans_presets.java:850
+#: build/trans_presets.java:865 build/trans_presets.java:887
+#: build/trans_presets.java:924 build/trans_presets.java:937
+#: build/trans_presets.java:949 build/trans_presets.java:961
+#: build/trans_presets.java:973 build/trans_presets.java:1013
+#: build/trans_presets.java:1539
 msgid "Motorcycle"
 msgstr "Motorsykkel"
@@ -25751,20 +25964,20 @@
 #. item "Barriers/Bump Gate" check "Motorcar"
 #. item "Barriers/Sally Port" check "Motorcar"
-#: 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
+#: build/trans_presets.java:438 build/trans_presets.java:522
+#: build/trans_presets.java:556 build/trans_presets.java:851
+#: build/trans_presets.java:866 build/trans_presets.java:888
+#: build/trans_presets.java:925 build/trans_presets.java:938
+#: build/trans_presets.java:950 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:1014
 msgid "Motorcar"
 msgstr "Motorkjøretøy"
 
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:439
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlig transport"
 
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
-#: build/trans_presets.java:682
+#: build/trans_presets.java:441
 msgid "Min. speed (km/h)"
 msgstr "Minste fart (km/t)"
@@ -25772,25 +25985,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
-#: build/trans_presets.java:683 build/trans_presets.java:746
+#: build/trans_presets.java:442 build/trans_presets.java:482
 msgid "Max. weight (tonnes)"
 msgstr "Maksvekt (tonn)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
-#: build/trans_presets.java:684
+#: build/trans_presets.java:443
 msgid "Max. axleload (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:444
 msgid "Max. Height (meters)"
 msgstr "Makshøyde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:686
+#: build/trans_presets.java:445
 msgid "Max. Width (meters)"
 msgstr "Maksbredde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:446
 msgid "Max. Length (meters)"
 msgstr "Makslengde (meter)"
@@ -25798,5 +26011,5 @@
 #. <separator/>
 #. item "Highways/Streets/Roundabout"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:449
 msgid "Roundabout"
 msgstr "Rundkjøring"
@@ -25807,5 +26020,5 @@
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:454
 msgid "Edit Junction"
 msgstr "Rediger kryss"
@@ -25823,5 +26036,5 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:699 build/trans_style.java:418
+#: build/trans_presets.java:457 build/trans_style.java:418
 #: build/trans_style.java:424
 msgid "motorway"
@@ -25829,5 +26042,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:700
+#: build/trans_presets.java:457
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -25846,5 +26059,5 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:701 build/trans_style.java:430
+#: build/trans_presets.java:457 build/trans_style.java:430
 #: build/trans_style.java:436
 msgid "trunk"
@@ -25852,5 +26065,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:702
+#: build/trans_presets.java:457
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -25869,5 +26082,5 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:703 build/trans_style.java:442
+#: build/trans_presets.java:457 build/trans_style.java:442
 #: build/trans_style.java:448
 msgid "primary"
@@ -25875,5 +26088,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:704
+#: build/trans_presets.java:457
 msgid "primary_link"
 msgstr "tilkjørselsvei_riksvei"
@@ -25892,5 +26105,5 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:705 build/trans_style.java:454
+#: build/trans_presets.java:457 build/trans_style.java:454
 #: build/trans_style.java:460
 msgid "secondary"
@@ -25904,10 +26117,10 @@
 #. <condition k="highway" v="tertiary"/>
 #. color tertiary
-#: build/trans_presets.java:706 build/trans_style.java:466
+#: build/trans_presets.java:457 build/trans_style.java:466
 msgid "tertiary"
 msgstr "kommunevei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:707
+#: build/trans_presets.java:457
 msgid "unclassified"
 msgstr "småvei"
@@ -25920,10 +26133,10 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:708 build/trans_style.java:2712
+#: build/trans_presets.java:457 build/trans_style.java:2712
 msgid "residential"
 msgstr "boligvei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:709
+#: build/trans_presets.java:457
 msgid "living_street"
 msgstr "gatetun"
@@ -25958,5 +26171,5 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:710 build/trans_style.java:508
+#: build/trans_presets.java:457 build/trans_style.java:508
 #: build/trans_style.java:3621
 msgid "service"
@@ -25964,5 +26177,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:711
+#: build/trans_presets.java:457
 msgid "bus_guideway"
 msgstr "trikkespor"
@@ -25986,5 +26199,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:712 build/trans_style.java:693
+#: build/trans_presets.java:457 build/trans_style.java:693
 #: build/trans_style.java:2767 build/trans_style.java:2768
 msgid "construction"
@@ -25996,25 +26209,25 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:475
 msgid "Edit Bridge"
 msgstr "Rediger bro"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:737
+#: build/trans_presets.java:477
 msgid "viaduct"
 msgstr ""
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:738
+#: build/trans_presets.java:477
 msgid "swing"
 msgstr ""
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:739
+#: build/trans_presets.java:477
 msgid "aqueduct"
 msgstr "akvadukt"
 
 #. item "Highways/Streets/Tunnel" label "Edit Tunnel"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:487
 msgid "Edit Tunnel"
 msgstr "Rediger tunnel"
@@ -26022,10 +26235,10 @@
 #. </optional>
 #. group "Ways"
-#: build/trans_presets.java:766
+#: build/trans_presets.java:501
 msgid "Ways"
 msgstr "Mindre veier"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:767
+#: build/trans_presets.java:502
 msgid "Track"
 msgstr "Traktorvei"
@@ -26034,35 +26247,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:505
 msgid "Edit Track"
 msgstr "Rediger traktorvei"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:510
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:776
+#: build/trans_presets.java:510
 msgid "grade1"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:777
+#: build/trans_presets.java:510
 msgid "grade2"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:778
+#: build/trans_presets.java:510
 msgid "grade3"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:779
+#: build/trans_presets.java:510
 msgid "grade4"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:780
+#: build/trans_presets.java:510
 msgid "grade5"
 msgstr ""
@@ -26070,5 +26283,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:791 build/trans_presets.java:882
+#: build/trans_presets.java:512 build/trans_presets.java:542
 msgid "MTB Scale"
 msgstr ""
@@ -26076,5 +26289,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:843
+#: build/trans_presets.java:526
 msgid "Path"
 msgstr "Sti"
@@ -26083,50 +26296,50 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
 #. item "Ways/Path" label "Edit Path"
-#: build/trans_presets.java:846
+#: build/trans_presets.java:529
 msgid "Edit Path"
 msgstr "Rediger sti"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:851
+#: build/trans_presets.java:534
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:852
+#: build/trans_presets.java:534
 msgid "T1 - hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:853
+#: build/trans_presets.java:534
 msgid "T2 - mountain hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:854
+#: build/trans_presets.java:534
 msgid "T3 - difficult, exposed hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:855
+#: build/trans_presets.java:534
 msgid "T4 - difficult, exposed, steep alpine trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:856
+#: build/trans_presets.java:534
 msgid "T5 - difficult alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:857
+#: build/trans_presets.java:534
 msgid "T6 - hazardous alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description
-#: build/trans_presets.java:859
+#: build/trans_presets.java:535
 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:860
+#: build/trans_presets.java:536
 msgid ""
 "Trail with continuous line and balanced ascent. Terrain partially steep, "
@@ -26135,5 +26348,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description
-#: build/trans_presets.java:861
+#: build/trans_presets.java:537
 msgid ""
 "exposed sites may be secured with ropes or chains, possible need to use "
@@ -26143,5 +26356,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description
-#: build/trans_presets.java:862
+#: build/trans_presets.java:538
 msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
@@ -26150,5 +26363,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description
-#: build/trans_presets.java:863
+#: build/trans_presets.java:539
 msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
@@ -26157,5 +26370,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T6 - hazardous alpine trail with climbing" short description
-#: build/trans_presets.java:864
+#: build/trans_presets.java:540
 msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
@@ -26164,10 +26377,10 @@
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:885
+#: build/trans_presets.java:543
 msgid "excellent"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:886
+#: build/trans_presets.java:543
 msgid "good"
 msgstr ""
@@ -26175,15 +26388,15 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:887 build/trans_presets.java:4253
+#: build/trans_presets.java:543 build/trans_presets.java:2693
 msgid "intermediate"
 msgstr "middels"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:888
+#: build/trans_presets.java:543
 msgid "bad"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:889
+#: build/trans_presets.java:543
 msgid "horrible"
 msgstr ""
@@ -26206,23 +26419,23 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: 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
+#: build/trans_presets.java:553 build/trans_presets.java:1789
+#: build/trans_presets.java:1807 build/trans_presets.java:1823
+#: build/trans_presets.java:1840 build/trans_presets.java:1858
+#: build/trans_presets.java:1875 build/trans_presets.java:1892
+#: build/trans_presets.java:1914 build/trans_presets.java:1937
+#: build/trans_presets.java:1956 build/trans_presets.java:1973
+#: build/trans_presets.java:1992 build/trans_presets.java:2011
+#: build/trans_presets.java:2027 build/trans_presets.java:2044
+#: build/trans_presets.java:2059
 msgid "Wheelchairs"
 msgstr ""
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:554
 msgid "Ski"
 msgstr "Ski"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:555
 msgid "Snowmobile"
 msgstr "Snøscooter"
@@ -26231,5 +26444,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:563
 msgid "Dedicated Bridleway"
 msgstr "Dedikert ridevei"
@@ -26237,5 +26450,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
 #. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:565
 msgid "Edit Bridleway"
 msgstr "Rediger ridevei"
@@ -26243,5 +26456,5 @@
 #. </optional>
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:582
 msgid "Dedicated Cycleway"
 msgstr "Dedikert sykkelvei"
@@ -26259,11 +26472,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:985 build/trans_presets.java:1027
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:630
 msgid "Edit Cycleway"
 msgstr "Rediger sykkelvei"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:598
 msgid "Pedestrians"
 msgstr ""
@@ -26271,5 +26484,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:603
 msgid "Segregated Foot- and Cycleway"
 msgstr "Adskilt gang- og sykkelvei"
@@ -26277,5 +26490,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:626
 msgid "Combined Foot- and Cycleway"
 msgstr "Kombinert gang- og sykkelvei"
@@ -26283,5 +26496,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:650
 msgid "Dedicated Footway"
 msgstr "Dedikert gangvei"
@@ -26290,5 +26503,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:653
 msgid "Edit Footway"
 msgstr "Rediger gangvei"
@@ -26296,5 +26509,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:669
 msgid "Steps"
 msgstr "Trapper"
@@ -26304,15 +26517,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:673
 msgid "Edit Flight of Steps"
 msgstr "Rediger trapper"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:687
 msgid "Amount of Steps"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:692
 msgid "Motorway Junction"
 msgstr "Motorveikryss"
@@ -26320,10 +26533,16 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:1182
+#: build/trans_presets.java:694
 msgid "Edit Motorway Junction"
 msgstr "Rediger motorveikryss"
 
+#. item "Waypoints/Motorway Junction" text "Exit to"
+#: build/trans_presets.java:699
+#, fuzzy
+msgid "Exit to"
+msgstr "Avslutt"
+
 #. item "Waypoints/Services"
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:701
 msgid "Services"
 msgstr "Service"
@@ -26331,5 +26550,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:703
 msgid "Edit Service Station"
 msgstr "Rediger Serviceområde"
@@ -26419,40 +26638,40 @@
 #. item "Relations/Route" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: 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
+#: build/trans_presets.java:708 build/trans_presets.java:875
+#: build/trans_presets.java:1453 build/trans_presets.java:1477
+#: build/trans_presets.java:1486 build/trans_presets.java:1495
+#: build/trans_presets.java:1502 build/trans_presets.java:1510
+#: build/trans_presets.java:1526 build/trans_presets.java:1535
+#: build/trans_presets.java:1554 build/trans_presets.java:1686
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1852 build/trans_presets.java:1869
+#: build/trans_presets.java:1928 build/trans_presets.java:1949
+#: build/trans_presets.java:1985 build/trans_presets.java:2004
+#: build/trans_presets.java:2135 build/trans_presets.java:2145
+#: build/trans_presets.java:2195 build/trans_presets.java:2280
+#: build/trans_presets.java:2305 build/trans_presets.java:2348
+#: build/trans_presets.java:2381 build/trans_presets.java:2413
+#: build/trans_presets.java:2426 build/trans_presets.java:2437
+#: build/trans_presets.java:2456 build/trans_presets.java:2465
+#: build/trans_presets.java:2472 build/trans_presets.java:2765
+#: build/trans_presets.java:2774 build/trans_presets.java:2896
+#: build/trans_presets.java:2915 build/trans_presets.java:2934
+#: build/trans_presets.java:2952 build/trans_presets.java:2963
+#: build/trans_presets.java:2979 build/trans_presets.java:3035
+#: build/trans_presets.java:3070 build/trans_presets.java:3078
+#: build/trans_presets.java:3086 build/trans_presets.java:3111
+#: build/trans_presets.java:3226 build/trans_presets.java:3235
+#: build/trans_presets.java:3252 build/trans_presets.java:3261
+#: build/trans_presets.java:3298 build/trans_presets.java:3347
+#: build/trans_presets.java:3370 build/trans_presets.java:3379
+#: build/trans_presets.java:3401 build/trans_presets.java:3416
+#: build/trans_presets.java:3426 build/trans_presets.java:3435
+#: build/trans_presets.java:3463 build/trans_presets.java:3472
+#: build/trans_presets.java:3511 build/trans_presets.java:3527
+#: build/trans_presets.java:3536 build/trans_presets.java:3545
+#: build/trans_presets.java:3561 build/trans_presets.java:3583
+#: build/trans_presets.java:3598 build/trans_presets.java:3607
+#: build/trans_presets.java:3875 build/trans_presets.java:3968
+#: build/trans_presets.java:4112 build/trans_presets.java:4132
 msgid "Operator"
 msgstr "Operatør"
@@ -26461,6 +26680,6 @@
 #. item "Waypoints/Rest Area" check "Toilets"
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:1196 build/trans_presets.java:1206
-#: build/trans_presets.java:3725
+#: build/trans_presets.java:709 build/trans_presets.java:719
+#: build/trans_presets.java:2452
 msgid "Toilets"
 msgstr "Toaletter"
@@ -26468,5 +26687,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:712
 msgid "Rest Area"
 msgstr ""
@@ -26474,5 +26693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:714
 msgid "Edit Rest Area"
 msgstr ""
@@ -26480,5 +26699,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:1209
+#: build/trans_presets.java:722
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -26488,5 +26707,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:727
 msgid "Traffic Signal"
 msgstr "Trafikklys"
@@ -26496,5 +26715,5 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:731
 msgid "Pedestrian crossing type"
 msgstr "Type gangfelt"
@@ -26503,6 +26722,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:1219 build/trans_presets.java:1257
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:731 build/trans_presets.java:753
+#: build/trans_presets.java:1365
 msgid "uncontrolled"
 msgstr "ukontrollert"
@@ -26511,6 +26730,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:1220 build/trans_presets.java:1258
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:731 build/trans_presets.java:753
+#: build/trans_presets.java:1365
 msgid "traffic_signals"
 msgstr "trafikklys"
@@ -26519,6 +26738,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:1221 build/trans_presets.java:1259
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:731 build/trans_presets.java:753
+#: build/trans_presets.java:1365
 msgid "island"
 msgstr "trafikkøy"
@@ -26527,6 +26746,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:1222 build/trans_presets.java:1260
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:731 build/trans_presets.java:753
+#: build/trans_presets.java:1365
 msgid "unmarked"
 msgstr "umerket"
@@ -26535,6 +26754,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:1226 build/trans_presets.java:1265
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:732 build/trans_presets.java:755
+#: build/trans_presets.java:1366
 msgid "Cross on horseback"
 msgstr "Kryssende ridevei"
@@ -26543,6 +26762,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:1227 build/trans_presets.java:1264
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:733 build/trans_presets.java:754
+#: build/trans_presets.java:1367
 msgid "Cross by bicycle"
 msgstr "Kryssende sykkelvei"
@@ -26551,11 +26770,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:1228 build/trans_presets.java:1266
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:734 build/trans_presets.java:756
+#: build/trans_presets.java:1368
 msgid "Crossing attendant"
 msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:735
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -26563,5 +26782,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:1230 build/trans_presets.java:1268
+#: build/trans_presets.java:735 build/trans_presets.java:757
 msgid "zebra"
 msgstr "zebra"
@@ -26569,5 +26788,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:1231 build/trans_presets.java:1269
+#: build/trans_presets.java:735 build/trans_presets.java:757
 msgid "pelican"
 msgstr "pelican"
@@ -26575,5 +26794,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:1232 build/trans_presets.java:1270
+#: build/trans_presets.java:735 build/trans_presets.java:757
 msgid "toucan"
 msgstr "toucan"
@@ -26581,5 +26800,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:1233 build/trans_presets.java:1271
+#: build/trans_presets.java:735 build/trans_presets.java:757
 msgid "puffin"
 msgstr "puffin"
@@ -26587,5 +26806,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:1234 build/trans_presets.java:1272
+#: build/trans_presets.java:735 build/trans_presets.java:757
 msgid "pegasus"
 msgstr "pegasus"
@@ -26593,5 +26812,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:1235 build/trans_presets.java:1273
+#: build/trans_presets.java:735 build/trans_presets.java:757
 msgid "tiger"
 msgstr "tiger"
@@ -26599,5 +26818,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:738
 msgid "Stop"
 msgstr "Full stopp"
@@ -26605,5 +26824,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:741
 msgid "Mini-roundabout"
 msgstr "Mini-rundkjøring"
@@ -26614,15 +26833,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:1247
+#: build/trans_presets.java:746
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:746
 msgid "clockwise"
 msgstr "med_klokka"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:748
 msgid "Pedestrian Crossing"
 msgstr "Fotgjengerfelt"
@@ -26631,15 +26850,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:751
 msgid "Edit Crossing"
 msgstr "Rediger fotgjengerfelt"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:757
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:759
 msgid "Traffic Calming"
 msgstr "Fartsdemping"
@@ -26647,40 +26866,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:761
 msgid "Edit Traffic Calming"
 msgstr "Rediger fartsdemping"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:762
 msgid "bump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:762
 msgid "chicane"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:762
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:762
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:1285
+#: build/trans_presets.java:762
 msgid "hump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:762
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:764
 msgid "Passing Place"
 msgstr "Passeringspunkt"
@@ -26688,5 +26907,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:766
 msgid "Edit Passing Place"
 msgstr "Rediger passeringspunkt"
@@ -26694,5 +26913,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:769
 msgid "Turning Circle"
 msgstr "Vendesirkel"
@@ -26702,5 +26921,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:774
 msgid "City Limit"
 msgstr "Bygrense"
@@ -26708,15 +26927,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:1301
+#: build/trans_presets.java:776
 msgid "Edit City Limit Sign"
 msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:781
 msgid "Second Name"
 msgstr "Annet navn"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:783
 msgid "Speed Camera"
 msgstr "Fotoboks"
@@ -26726,5 +26945,5 @@
 #. <separator/>
 #. item "Waypoints/Incline"
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:788
 msgid "Incline"
 msgstr "Stigning"
@@ -26732,5 +26951,5 @@
 #. <key key="highway" value="incline" />
 #. item "Waypoints/Incline Steep"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:791
 msgid "Incline Steep"
 msgstr "Sterk stigning"
@@ -26738,5 +26957,5 @@
 #. <key key="highway" value="incline_steep" />
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:794
 msgid "Grit Bin"
 msgstr "Strøkasse"
@@ -26746,10 +26965,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:799
 msgid "Ford"
 msgstr "Vadested"
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:800
 msgid "Edit Ford"
 msgstr "Rediger vadested"
@@ -26757,5 +26976,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:807
 msgid "Mountain Pass"
 msgstr "Fjellpass"
@@ -26763,5 +26982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:809
 msgid "Edit Mountain Pass"
 msgstr "Rediger fjellpass"
@@ -26773,7 +26992,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: 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
+#: build/trans_presets.java:814 build/trans_presets.java:1870
+#: build/trans_presets.java:2119 build/trans_presets.java:3741
+#: build/trans_presets.java:3749 build/trans_presets.java:3757
 msgid "Elevation"
 msgstr "Høyde"
@@ -26807,18 +27026,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: 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
+#: build/trans_presets.java:815 build/trans_presets.java:1053
+#: build/trans_presets.java:1064 build/trans_presets.java:1078
+#: build/trans_presets.java:1093 build/trans_presets.java:1712
+#: build/trans_presets.java:2174 build/trans_presets.java:2234
+#: build/trans_presets.java:3126 build/trans_presets.java:3657
+#: build/trans_presets.java:3664 build/trans_presets.java:3671
+#: build/trans_presets.java:3678 build/trans_presets.java:3685
+#: build/trans_presets.java:3693 build/trans_presets.java:3701
+#: build/trans_presets.java:3709 build/trans_presets.java:3716
+#: build/trans_presets.java:3723 build/trans_presets.java:3732
+#: build/trans_presets.java:3742 build/trans_presets.java:3750
+#: build/trans_presets.java:3758 build/trans_presets.java:3765
+#: build/trans_presets.java:3774 build/trans_presets.java:3782
+#: build/trans_presets.java:4047
 msgid "Wikipedia"
 msgstr ""
@@ -26826,5 +27045,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:819
 msgid "Barriers"
 msgstr "Stengsel"
@@ -26832,5 +27051,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:822
 msgid "Bollard"
 msgstr "Sperresøyle"
@@ -26838,5 +27057,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:824
 msgid "Edit Bollard"
 msgstr "Rediger sperresøyle"
@@ -26881,16 +27100,16 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: 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
+#: build/trans_presets.java:827 build/trans_presets.java:846
+#: build/trans_presets.java:860 build/trans_presets.java:882
+#: build/trans_presets.java:919 build/trans_presets.java:932
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:990 build/trans_presets.java:999
+#: build/trans_presets.java:1008
 msgid "Allowed traffic:"
 msgstr "Tillatt trafikk:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:834
 msgid "Cycle Barrier"
 msgstr "Halvbommer"
@@ -26899,5 +27118,5 @@
 #. <key key="barrier" value="cycle_barrier" />
 #. item "Barriers/Block"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:838
 msgid "Block"
 msgstr "Steinblokk"
@@ -26905,5 +27124,5 @@
 #. <key key="barrier" value="block" />
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:841
 msgid "Cattle Grid"
 msgstr "Ferist"
@@ -26911,10 +27130,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:843
 msgid "Edit Cattle Grid"
 msgstr "Rediger ferist"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:853
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -26922,15 +27141,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:856
 msgid "Spikes"
 msgstr "Pigghinder"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:857
 msgid "Edit Spikes"
 msgstr "Rediger pigghinder"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:868
 msgid "Toll Booth"
 msgstr "Bomstasjon"
@@ -26938,5 +27157,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:870
 msgid "Edit Toll Booth"
 msgstr "Rediger bomstasjon"
@@ -26944,10 +27163,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:878
 msgid "Border Control"
 msgstr "Tollstasjon"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:879
 msgid "Edit Border Control"
 msgstr "Rediger tollstasjon"
@@ -26956,5 +27175,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:1418
+#: build/trans_presets.java:893
 msgid "Hedge"
 msgstr "Hekk"
@@ -26965,25 +27184,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:1422 build/trans_presets.java:1424
+#: build/trans_presets.java:897 build/trans_presets.java:899
 msgid "Fence"
 msgstr "Gjerde"
 
 #. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:899
 msgid "fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:1426
+#: build/trans_presets.java:899
 msgid "wood_fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:1427
+#: build/trans_presets.java:899
 msgid "wire_fence"
 msgstr ""
 
 #. item "Barriers/Wall"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:901
 msgid "Wall"
 msgstr "Mur"
@@ -26991,5 +27210,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:904
 msgid "City Wall"
 msgstr "Bymur"
@@ -26998,5 +27217,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:908
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -27007,15 +27226,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:915
 msgid "Entrance"
 msgstr "Inngang"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:916
 msgid "Edit Entrance"
 msgstr "Rediger inngang"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:1456
+#: build/trans_presets.java:927
 msgid "Gate"
 msgstr "Port"
@@ -27023,50 +27242,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:929
 msgid "Edit Gate"
 msgstr "Rediger port"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:940
 msgid "Lift Gate"
 msgstr "Veibom"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:1470
+#: build/trans_presets.java:941
 msgid "Edit Lift Gate"
 msgstr "Rediger veibom"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:952
 msgid "Hampshire Gate"
 msgstr "Gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:953
 msgid "Edit Hampshire Gate"
 msgstr "Rediger gjerdestengsel"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:964
 msgid "Bump Gate"
 msgstr "Støtfangergjerde"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:965
 msgid "Edit Bump Gate"
 msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:976
 msgid "Kissing Gate"
 msgstr "Fotgjengerport"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:977
 msgid "Edit Kissing Gate"
 msgstr "Rediger fotgjengerport"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:985
 msgid "Stile"
 msgstr "Gjerdetrapp"
@@ -27074,25 +27293,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:987
 msgid "Edit Stile"
 msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:995
 msgid "Turnstile"
 msgstr "Rotasjonsport"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:996
 msgid "Edit Turnstile"
 msgstr "Rediger rotasjonsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1004
 msgid "Sally Port"
 msgstr "Sortiport"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1005
 msgid "Edit Sally Port"
 msgstr "Rediger sortiport"
@@ -27102,6 +27321,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:1548 build/trans_presets.java:1549
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1019 build/trans_presets.java:1020
+#: build/trans_presets.java:1121
 msgid "Water"
 msgstr "Vann"
@@ -27109,5 +27328,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1022
 msgid "Drain"
 msgstr "Drenering"
@@ -27115,10 +27334,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1024
 msgid "Edit Drain"
 msgstr "Rediger drenering"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1030
 msgid "Ditch"
 msgstr "Dike"
@@ -27126,10 +27345,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1032
 msgid "Edit Ditch"
 msgstr "Rediger dike"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1038
 msgid "Stream"
 msgstr "Bekk"
@@ -27137,10 +27356,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1040
 msgid "Edit Stream"
 msgstr "Rediger bekk"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1046
 msgid "Canal"
 msgstr "Kanal"
@@ -27148,10 +27367,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1048
 msgid "Edit Canal"
 msgstr "Rediger kanal"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1055
 msgid "River"
 msgstr "Elv"
@@ -27161,5 +27380,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1059
 msgid "Edit River"
 msgstr "Rediger elv"
@@ -27167,5 +27386,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1067
 msgid "Spring"
 msgstr "Vannkilde"
@@ -27173,20 +27392,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1069
 msgid "Edit Spring"
 msgstr "Rediger vannkilde"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1073
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1074
 msgid "Edit Waterfall"
 msgstr "Rediger foss"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1080
 msgid "Weir"
 msgstr "Terskeldam"
@@ -27194,10 +27413,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1082
 msgid "Edit Weir"
 msgstr "Rediger terskeldam"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1087
 msgid "Dam"
 msgstr "Demning"
@@ -27205,10 +27424,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1089
 msgid "Edit Dam"
 msgstr "Rediger demning"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1095
 msgid "Groyne"
 msgstr ""
@@ -27216,5 +27435,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1097
 msgid "Edit Groyne"
 msgstr ""
@@ -27224,15 +27443,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1102
 msgid "Basin"
 msgstr "Basseng"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1103
 msgid "Edit Basin Landuse"
 msgstr "Rediger basseng"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1108
 msgid "Reservoir"
 msgstr "Drikkevannskilde"
@@ -27240,15 +27459,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1644
+#: build/trans_presets.java:1110
 msgid "Edit Reservoir Landuse"
 msgstr "Rediger drikkevannskilde"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1115
 msgid "Covered Reservoir"
 msgstr "Tildekt drikkevannskilde"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1116
 msgid "Edit Covered Reservoir"
 msgstr "Rediger tildekt drikkevannskilde"
@@ -27256,20 +27475,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1123
 msgid "Edit Water"
 msgstr "Rediger vann"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1127
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1128
 msgid "Edit Land"
 msgstr "Rediger land"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1132
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -27277,10 +27496,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1134
 msgid "Edit Coastline"
 msgstr "Rediger kystlinje"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1138
 msgid "Riverbank"
 msgstr "Elvebredd"
@@ -27289,5 +27508,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1141
 msgid "Edit Riverbank"
 msgstr "Rediger elvebredd"
@@ -27295,5 +27514,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1146
 msgid "Wetland"
 msgstr "Våtmarksområde"
@@ -27304,15 +27523,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:1685
+#: build/trans_presets.java:1151
 msgid "Edit Wetland"
 msgstr "Rediger våtmarksområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1154
 msgid "swamp"
 msgstr "Sumpområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1154
 msgid "bog"
 msgstr "Flytemyr"
@@ -27325,40 +27544,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1691 build/trans_style.java:2894
+#: build/trans_presets.java:1154 build/trans_style.java:2894
 msgid "marsh"
 msgstr "myrområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1154
 msgid "reedbed"
 msgstr "Sivområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1154
 msgid "saltmarsh"
 msgstr "Saltmyr"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1154
 msgid "tidalflat"
 msgstr "Tidevannsflate"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1154
 msgid "mangrove"
 msgstr "Mangrove"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1156
 msgid "Mud"
 msgstr "Gjørme"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1157
 msgid "Edit Mud"
 msgstr "Rediger gjørme"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1161
 msgid "Beach"
 msgstr "Strand"
@@ -27366,20 +27585,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1163
 msgid "Edit Beach"
 msgstr "Rediger strand"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1167
 msgid "Bay"
 msgstr "Havbukt"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1168
 msgid "Edit Bay"
 msgstr "Rediger havbukt"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1172
 msgid "Cliff"
 msgstr "Klippe"
@@ -27387,15 +27606,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1174
 msgid "Edit Cliff"
 msgstr "Rediger klippe"
 
 #. group "Shipping"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1179
 msgid "Shipping"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1180
 msgid "Ferry Terminal"
 msgstr "Fergeleie"
@@ -27403,20 +27622,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1182
 msgid "Edit Ferry Terminal"
 msgstr "Rediger fergeleie"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1185
 msgid "Cargo"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1185
 msgid "passengers"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1185
 msgid "vehicle"
 msgstr ""
@@ -27501,5 +27720,5 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1730 build/trans_presets.java:6239
+#: build/trans_presets.java:1185 build/trans_presets.java:4105
 #: build/trans_style.java:190 build/trans_style.java:520
 #: build/trans_style.java:540 build/trans_style.java:546
@@ -27512,15 +27731,15 @@
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1185
 msgid "hgv"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1185
 msgid "passengers;vehicle"
 msgstr ""
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1187
 msgid "Ferry Route"
 msgstr "Fergerute"
@@ -27528,5 +27747,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1189
 msgid "Edit Ferry"
 msgstr "Rediger fergerute"
@@ -27535,15 +27754,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1197
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1198
 msgid "Edit Marina"
 msgstr "Rediger marina"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1750
+#: build/trans_presets.java:1202
 msgid "Pier"
 msgstr "Brygge"
@@ -27551,10 +27770,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1204
 msgid "Edit Pier"
 msgstr "Rediger brygge"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1208
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -27563,5 +27782,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Snuplass"
@@ -27571,5 +27790,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1217
 msgid "Slipway"
 msgstr "Båtslipp"
@@ -27579,10 +27798,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1221
 msgid "Edit Slipway"
 msgstr "Rediger båtslipp"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1225
 msgid "Boatyard"
 msgstr "Skipsverft"
@@ -27590,10 +27809,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1227
 msgid "Edit Boatyard"
 msgstr "Rediger skipsverft"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1232
 msgid "Dock"
 msgstr "Tørrdokk"
@@ -27601,20 +27820,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1234
 msgid "Edit Dock"
 msgstr "Rediger tørrdokk"
 
 #. group "Transport"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1241
 msgid "Transport"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1242
 msgid "Railway"
 msgstr "Jernbane"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1243
 msgid "Rail"
 msgstr "Jernbane"
@@ -27622,5 +27841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1245
 msgid "Edit Rail"
 msgstr "Rediger jernbane"
@@ -27650,7 +27869,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: 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
+#: build/trans_presets.java:1249 build/trans_presets.java:1261
+#: build/trans_presets.java:1285 build/trans_presets.java:1297
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
 msgid "Gauge (mm)"
 msgstr ""
@@ -27666,8 +27885,8 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: 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
+#: build/trans_presets.java:1250 build/trans_presets.java:1262
+#: build/trans_presets.java:1274 build/trans_presets.java:1286
+#: build/trans_presets.java:1298 build/trans_presets.java:1310
+#: build/trans_presets.java:1322
 msgid "Types"
 msgstr ""
@@ -27681,8 +27900,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: 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
+#: build/trans_presets.java:1250 build/trans_presets.java:1262
+#: build/trans_presets.java:1274 build/trans_presets.java:1286
+#: build/trans_presets.java:1298 build/trans_presets.java:1310
+#: build/trans_presets.java:1322 build/trans_presets.java:1351
 msgid "yard"
 msgstr "Stasjonsområde"
@@ -27696,8 +27915,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: 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
+#: build/trans_presets.java:1250 build/trans_presets.java:1262
+#: build/trans_presets.java:1274 build/trans_presets.java:1286
+#: build/trans_presets.java:1298 build/trans_presets.java:1310
+#: build/trans_presets.java:1322 build/trans_presets.java:1351
 msgid "siding"
 msgstr "Sidespor"
@@ -27711,8 +27930,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: 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
+#: build/trans_presets.java:1250 build/trans_presets.java:1262
+#: build/trans_presets.java:1274 build/trans_presets.java:1286
+#: build/trans_presets.java:1298 build/trans_presets.java:1310
+#: build/trans_presets.java:1322 build/trans_presets.java:1351
 msgid "spur"
 msgstr "Privat sidespor"
@@ -27725,8 +27944,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: 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
+#: build/trans_presets.java:1251 build/trans_presets.java:1263
+#: build/trans_presets.java:1275 build/trans_presets.java:1287
+#: build/trans_presets.java:1299 build/trans_presets.java:1311
+#: build/trans_presets.java:1323
 msgid "Electrified"
 msgstr ""
@@ -27739,8 +27958,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: 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
+#: build/trans_presets.java:1251 build/trans_presets.java:1263
+#: build/trans_presets.java:1275 build/trans_presets.java:1287
+#: build/trans_presets.java:1299 build/trans_presets.java:1311
+#: build/trans_presets.java:1323
 msgid "contact_line"
 msgstr ""
@@ -27801,8 +28020,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: 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_presets.java:1251 build/trans_presets.java:1263
+#: build/trans_presets.java:1275 build/trans_presets.java:1287
+#: build/trans_presets.java:1299 build/trans_presets.java:1311
+#: build/trans_presets.java:1323 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
@@ -27822,9 +28041,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: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
+#: build/trans_presets.java:1252 build/trans_presets.java:1264
+#: build/trans_presets.java:1276 build/trans_presets.java:1288
+#: build/trans_presets.java:1300 build/trans_presets.java:1312
+#: build/trans_presets.java:1324 build/trans_presets.java:1478
+#: build/trans_presets.java:3114
 msgid "Voltage"
 msgstr "Spenning"
@@ -27837,8 +28056,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: 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
+#: build/trans_presets.java:1253 build/trans_presets.java:1265
+#: build/trans_presets.java:1277 build/trans_presets.java:1289
+#: build/trans_presets.java:1301 build/trans_presets.java:1313
+#: build/trans_presets.java:1325
 msgid "Frequency (Hz)"
 msgstr ""
@@ -27851,8 +28070,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: 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
+#: build/trans_presets.java:1253 build/trans_presets.java:1265
+#: build/trans_presets.java:1277 build/trans_presets.java:1289
+#: build/trans_presets.java:1301 build/trans_presets.java:1313
+#: build/trans_presets.java:1325
 msgid "16.7"
 msgstr ""
@@ -27860,10 +28079,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1256
 msgid "Narrow Gauge Rail"
 msgstr "Smal jernbane"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1818
+#: build/trans_presets.java:1257
 msgid "Edit Narrow Gauge Rail"
 msgstr "Rediger smal jernbane"
@@ -27871,5 +28090,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1268
 msgid "Monorail"
 msgstr "Monorail"
@@ -27877,5 +28096,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1270
 msgid "Edit Monorail"
 msgstr "Rediger Monorail"
@@ -27883,10 +28102,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1280
 msgid "Preserved"
 msgstr "Fredet bane"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1281
 msgid "Edit Preserved Railway"
 msgstr "Rediger fredet bane"
@@ -27894,10 +28113,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1292
 msgid "Light Rail"
 msgstr "Bybane"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1293
 msgid "Edit Light Rail"
 msgstr "Rediger bybane"
@@ -27905,10 +28124,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1304
 msgid "Subway"
 msgstr "T-bane"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1305
 msgid "Edit Subway"
 msgstr "Rediger T-bane"
@@ -27916,10 +28135,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1316
 msgid "Tram"
 msgstr "Trikk"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1317
 msgid "Edit Tram"
 msgstr "Rediger trikk"
@@ -27927,5 +28146,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1328
 msgid "Bus Guideway"
 msgstr "Busspor"
@@ -27933,5 +28152,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:1968
+#: build/trans_presets.java:1330
 msgid "Edit Bus Guideway"
 msgstr "Rediger busspor"
@@ -27940,10 +28159,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1347
 msgid "Disused Rail"
 msgstr "Nedlagt jernbane"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:1348
 msgid "Edit Disused Railway"
 msgstr "Rediger nedlagt jernbane"
@@ -27952,10 +28171,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:1351
 msgid "Optional Types"
 msgstr "Alternative typer"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:1353
 msgid "Abandoned Rail"
 msgstr "Revet jernbane"
@@ -27964,5 +28183,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:1357
 msgid "Level Crossing"
 msgstr "Planovergang"
@@ -27971,5 +28190,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:1361
 msgid "Crossing"
 msgstr "Fotgjengerfelt"
@@ -27979,5 +28198,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:1365
 msgid "Crossing type"
 msgstr "Type fotgjengerfelt"
@@ -27985,5 +28204,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:1371
 msgid "Turntable"
 msgstr "Dreieskive"
@@ -27992,5 +28211,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:1375
 msgid "Buffer Stop"
 msgstr ""
@@ -27999,10 +28218,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1380
 msgid "Aerialway"
 msgstr "Taubaner og -heiser"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:1381
 msgid "Chair Lift"
 msgstr "Stolheis"
@@ -28010,10 +28229,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:1383
 msgid "Edit Chair Lift"
 msgstr "Rediger stolheis"
 
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:1387
 msgid "Drag Lift"
 msgstr "T-krokheis"
@@ -28021,10 +28240,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:1389
 msgid "Edit Drag Lift"
 msgstr "Rediger T-krokheis"
 
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:1393
 msgid "Cable Car"
 msgstr "Taubane"
@@ -28032,10 +28251,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1395
 msgid "Edit Cable Car"
 msgstr "Rediger taubane"
 
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:1399
 msgid "Gondola"
 msgstr "Gondolbane"
@@ -28043,5 +28262,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:1401
 msgid "Edit Gondola"
 msgstr "Rediger gondolbane"
@@ -28049,5 +28268,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:1406
 msgctxt "aerialway"
 msgid "Station"
@@ -28056,5 +28275,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:1408
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -28062,5 +28281,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:1412
 msgctxt "aerialway"
 msgid "Pylon"
@@ -28069,5 +28288,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:1414
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -28075,5 +28294,5 @@
 
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:1418
 msgctxt "aerialway"
 msgid "Goods"
@@ -28081,5 +28300,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:1419
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -28097,6 +28316,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:2092 build/trans_presets.java:2280
-#: build/trans_presets.java:2355 build/trans_surveyor.java:24
+#: build/trans_presets.java:1426 build/trans_presets.java:1540
+#: build/trans_presets.java:1572 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkering"
@@ -28105,5 +28324,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:1429
 msgid "Edit Parking"
 msgstr "Rediger parkering"
@@ -28114,7 +28333,7 @@
 #. item "Facilities/Toilets" text "Reference number"
 #. item "Vending machine" text "Reference number"
-#: 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
+#: build/trans_presets.java:1432 build/trans_presets.java:2136
+#: build/trans_presets.java:2146 build/trans_presets.java:2457
+#: build/trans_presets.java:3608
 msgid "Reference number"
 msgstr "Referansenummer"
@@ -28122,5 +28341,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:2100 build/trans_presets.java:2286
+#: build/trans_presets.java:1433 build/trans_presets.java:1545
 msgid "multi-storey"
 msgstr "P-hus"
@@ -28128,5 +28347,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:2101 build/trans_presets.java:2287
+#: build/trans_presets.java:1433 build/trans_presets.java:1545
 msgid "surface"
 msgstr "Overflateparkering"
@@ -28134,10 +28353,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:2102 build/trans_presets.java:2288
+#: build/trans_presets.java:1433 build/trans_presets.java:1545
 msgid "underground"
 msgstr "P-kjeller"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:1434
 msgid "Park and Ride"
 msgstr ""
@@ -28148,7 +28367,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: 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
+#: build/trans_presets.java:1435 build/trans_presets.java:1546
+#: build/trans_presets.java:2137 build/trans_presets.java:2147
+#: build/trans_presets.java:2458
 msgid "Fee"
 msgstr "Gebyr"
@@ -28156,25 +28375,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:1437
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:1438
 msgid "Spaces for Disabled"
 msgstr "Handicap-plasser"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:1439
 msgid "Spaces for Women"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:1440
 msgid "Spaces for Parents"
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:1441
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
@@ -28182,5 +28401,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:1444
 msgid "Fuel"
 msgstr "Bensinstasjon"
@@ -28190,5 +28409,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:1448
 msgid "Edit Fuel"
 msgstr "Rediger bensinstasjon"
@@ -28202,118 +28421,118 @@
 #. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: 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
+#: build/trans_presets.java:1450 build/trans_presets.java:1485
+#: build/trans_presets.java:1501 build/trans_presets.java:1509
+#: build/trans_presets.java:1525 build/trans_presets.java:1534
+#: build/trans_presets.java:1553
 msgid "Brand"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:1450
 msgid "Agip"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:1450
 msgid "Aral"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:1450
 msgid "Avia"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:1450
 msgid "BP"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:1450
 msgid "Chevron"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:1450
 msgid "Citgo"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:1450
 msgid "Esso"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:1450
 msgid "Exxon"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:1450
 msgid "Gulf"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:1450
 msgid "Mobil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:1450
 msgid "OMV"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2150
+#: build/trans_presets.java:1450
 msgid "Petro-Canada"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:1450
 msgid "Pioneer"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:1450
 msgid "Q8"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:1450
 msgid "Repsol"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:1450
 msgid "Shell"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:1450
 msgid "Sunoco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:1450
 msgid "Statoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:1450
 msgid "Tamoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:1450
 msgid "Texaco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:1450
 msgid "Total"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:1450
 msgid "Independent"
 msgstr ""
@@ -28406,48 +28625,48 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: 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
+#: build/trans_presets.java:1454 build/trans_presets.java:1487
+#: build/trans_presets.java:1503 build/trans_presets.java:1511
+#: build/trans_presets.java:1527 build/trans_presets.java:1536
+#: build/trans_presets.java:1555 build/trans_presets.java:1931
+#: build/trans_presets.java:1951 build/trans_presets.java:1968
+#: build/trans_presets.java:1987 build/trans_presets.java:2006
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2072
+#: build/trans_presets.java:2087 build/trans_presets.java:2173
+#: build/trans_presets.java:2180 build/trans_presets.java:2196
+#: build/trans_presets.java:2233 build/trans_presets.java:2249
+#: build/trans_presets.java:2272 build/trans_presets.java:2306
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2405 build/trans_presets.java:2414
+#: build/trans_presets.java:2427 build/trans_presets.java:2448
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:3132 build/trans_presets.java:3140
+#: build/trans_presets.java:3189 build/trans_presets.java:3196
+#: build/trans_presets.java:3203 build/trans_presets.java:3211
+#: build/trans_presets.java:3218 build/trans_presets.java:3227
+#: build/trans_presets.java:3236 build/trans_presets.java:3243
+#: build/trans_presets.java:3253 build/trans_presets.java:3262
+#: build/trans_presets.java:3268 build/trans_presets.java:3276
+#: build/trans_presets.java:3282 build/trans_presets.java:3290
+#: build/trans_presets.java:3299 build/trans_presets.java:3305
+#: build/trans_presets.java:3312 build/trans_presets.java:3318
+#: build/trans_presets.java:3326 build/trans_presets.java:3333
+#: build/trans_presets.java:3339 build/trans_presets.java:3348
+#: build/trans_presets.java:3356 build/trans_presets.java:3362
+#: build/trans_presets.java:3371 build/trans_presets.java:3380
+#: build/trans_presets.java:3386 build/trans_presets.java:3392
+#: build/trans_presets.java:3402 build/trans_presets.java:3410
+#: build/trans_presets.java:3427 build/trans_presets.java:3436
+#: build/trans_presets.java:3443 build/trans_presets.java:3449
+#: build/trans_presets.java:3455 build/trans_presets.java:3464
+#: build/trans_presets.java:3473 build/trans_presets.java:3481
+#: build/trans_presets.java:3488 build/trans_presets.java:3496
+#: build/trans_presets.java:3503 build/trans_presets.java:3512
+#: build/trans_presets.java:3519 build/trans_presets.java:3528
+#: build/trans_presets.java:3537 build/trans_presets.java:3546
+#: build/trans_presets.java:3553 build/trans_presets.java:3562
+#: build/trans_presets.java:3568 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3590
+#: build/trans_presets.java:3599
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -28537,46 +28756,46 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: 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
+#: build/trans_presets.java:1454 build/trans_presets.java:1487
+#: build/trans_presets.java:1503 build/trans_presets.java:1511
+#: build/trans_presets.java:1527 build/trans_presets.java:1536
+#: build/trans_presets.java:1555 build/trans_presets.java:1931
+#: build/trans_presets.java:1951 build/trans_presets.java:1968
+#: build/trans_presets.java:1987 build/trans_presets.java:2006
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2087
+#: build/trans_presets.java:2173 build/trans_presets.java:2180
+#: build/trans_presets.java:2233 build/trans_presets.java:2249
+#: build/trans_presets.java:2272 build/trans_presets.java:2306
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2405 build/trans_presets.java:2414
+#: build/trans_presets.java:2448 build/trans_presets.java:2593
+#: build/trans_presets.java:2599 build/trans_presets.java:3132
+#: build/trans_presets.java:3140 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3211 build/trans_presets.java:3218
+#: build/trans_presets.java:3227 build/trans_presets.java:3236
+#: build/trans_presets.java:3243 build/trans_presets.java:3253
+#: build/trans_presets.java:3262 build/trans_presets.java:3268
+#: build/trans_presets.java:3276 build/trans_presets.java:3282
+#: build/trans_presets.java:3290 build/trans_presets.java:3299
+#: build/trans_presets.java:3305 build/trans_presets.java:3312
+#: build/trans_presets.java:3318 build/trans_presets.java:3326
+#: build/trans_presets.java:3333 build/trans_presets.java:3339
+#: build/trans_presets.java:3348 build/trans_presets.java:3356
+#: build/trans_presets.java:3362 build/trans_presets.java:3371
+#: build/trans_presets.java:3380 build/trans_presets.java:3386
+#: build/trans_presets.java:3392 build/trans_presets.java:3402
+#: build/trans_presets.java:3410 build/trans_presets.java:3427
+#: build/trans_presets.java:3436 build/trans_presets.java:3443
+#: build/trans_presets.java:3449 build/trans_presets.java:3455
+#: build/trans_presets.java:3464 build/trans_presets.java:3473
+#: build/trans_presets.java:3481 build/trans_presets.java:3488
+#: build/trans_presets.java:3496 build/trans_presets.java:3503
+#: build/trans_presets.java:3512 build/trans_presets.java:3519
+#: build/trans_presets.java:3528 build/trans_presets.java:3537
+#: build/trans_presets.java:3546 build/trans_presets.java:3553
+#: build/trans_presets.java:3562 build/trans_presets.java:3568
+#: build/trans_presets.java:3575 build/trans_presets.java:3584
+#: build/trans_presets.java:3590 build/trans_presets.java:3599
 msgid "24/7"
 msgstr ""
@@ -28667,47 +28886,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: 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
+#: build/trans_presets.java:1454 build/trans_presets.java:1487
+#: build/trans_presets.java:1503 build/trans_presets.java:1511
+#: build/trans_presets.java:1527 build/trans_presets.java:1536
+#: build/trans_presets.java:1555 build/trans_presets.java:1931
+#: build/trans_presets.java:1951 build/trans_presets.java:1968
+#: build/trans_presets.java:1987 build/trans_presets.java:2006
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2087
+#: build/trans_presets.java:2173 build/trans_presets.java:2180
+#: build/trans_presets.java:2196 build/trans_presets.java:2233
+#: build/trans_presets.java:2249 build/trans_presets.java:2272
+#: build/trans_presets.java:2306 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2405
+#: build/trans_presets.java:2414 build/trans_presets.java:2448
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:3132 build/trans_presets.java:3140
+#: build/trans_presets.java:3189 build/trans_presets.java:3196
+#: build/trans_presets.java:3203 build/trans_presets.java:3211
+#: build/trans_presets.java:3218 build/trans_presets.java:3227
+#: build/trans_presets.java:3236 build/trans_presets.java:3243
+#: build/trans_presets.java:3253 build/trans_presets.java:3262
+#: build/trans_presets.java:3268 build/trans_presets.java:3276
+#: build/trans_presets.java:3282 build/trans_presets.java:3290
+#: build/trans_presets.java:3299 build/trans_presets.java:3305
+#: build/trans_presets.java:3312 build/trans_presets.java:3318
+#: build/trans_presets.java:3326 build/trans_presets.java:3333
+#: build/trans_presets.java:3339 build/trans_presets.java:3348
+#: build/trans_presets.java:3356 build/trans_presets.java:3362
+#: build/trans_presets.java:3371 build/trans_presets.java:3380
+#: build/trans_presets.java:3386 build/trans_presets.java:3392
+#: build/trans_presets.java:3402 build/trans_presets.java:3410
+#: build/trans_presets.java:3427 build/trans_presets.java:3436
+#: build/trans_presets.java:3443 build/trans_presets.java:3449
+#: build/trans_presets.java:3455 build/trans_presets.java:3464
+#: build/trans_presets.java:3473 build/trans_presets.java:3481
+#: build/trans_presets.java:3488 build/trans_presets.java:3496
+#: build/trans_presets.java:3503 build/trans_presets.java:3512
+#: build/trans_presets.java:3519 build/trans_presets.java:3528
+#: build/trans_presets.java:3537 build/trans_presets.java:3546
+#: build/trans_presets.java:3553 build/trans_presets.java:3562
+#: build/trans_presets.java:3568 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3590
+#: build/trans_presets.java:3599
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -28776,126 +28995,126 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: 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
+#: build/trans_presets.java:1454 build/trans_presets.java:1487
+#: build/trans_presets.java:1503 build/trans_presets.java:1511
+#: build/trans_presets.java:1527 build/trans_presets.java:1536
+#: build/trans_presets.java:1555 build/trans_presets.java:1931
+#: build/trans_presets.java:1951 build/trans_presets.java:1968
+#: build/trans_presets.java:1987 build/trans_presets.java:2006
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2087
+#: build/trans_presets.java:2173 build/trans_presets.java:2180
+#: build/trans_presets.java:2233 build/trans_presets.java:2249
+#: build/trans_presets.java:2272 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2405
+#: build/trans_presets.java:2448 build/trans_presets.java:2593
+#: build/trans_presets.java:2599 build/trans_presets.java:3132
+#: build/trans_presets.java:3140 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3211 build/trans_presets.java:3218
+#: build/trans_presets.java:3243 build/trans_presets.java:3268
+#: build/trans_presets.java:3276 build/trans_presets.java:3282
+#: build/trans_presets.java:3290 build/trans_presets.java:3305
+#: build/trans_presets.java:3312 build/trans_presets.java:3318
+#: build/trans_presets.java:3326 build/trans_presets.java:3333
+#: build/trans_presets.java:3339 build/trans_presets.java:3356
+#: build/trans_presets.java:3362 build/trans_presets.java:3386
+#: build/trans_presets.java:3392 build/trans_presets.java:3402
+#: build/trans_presets.java:3410 build/trans_presets.java:3443
+#: build/trans_presets.java:3449 build/trans_presets.java:3455
+#: build/trans_presets.java:3481 build/trans_presets.java:3488
+#: build/trans_presets.java:3496 build/trans_presets.java:3503
+#: build/trans_presets.java:3519 build/trans_presets.java:3553
+#: build/trans_presets.java:3568 build/trans_presets.java:3575
+#: build/trans_presets.java:3590
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:1455
 msgid "With shop"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:1455
 msgid "convenience"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:1455
 msgid "kiosk"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:1456
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:1457
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:1458
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:1459
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:1460
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:1461
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1462
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:1463
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:1464
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:1465
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:1466
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:1467
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:1468
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:1469
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:1470
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -28903,5 +29122,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:1473
 msgid "Charging Station"
 msgstr ""
@@ -28909,20 +29128,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:2195
+#: build/trans_presets.java:1475
 msgid "Edit Charging Station (for electric cars)"
 msgstr ""
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:1479
 msgid "Amperage"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:1481
 msgid "Wash"
 msgstr "Bilvask"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:1482
 msgid "Edit Car Wash"
 msgstr "Rediger bilvask"
@@ -28930,5 +29149,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:1490
 msgid "Car Dealer"
 msgstr "Bilforretning"
@@ -28936,5 +29155,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:1492
 msgid "Edit Car Shop"
 msgstr "Rediger bilforretning"
@@ -28942,20 +29161,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:2221 build/trans_presets.java:2321
+#: build/trans_presets.java:1497 build/trans_presets.java:1559
 msgid "Repair"
 msgstr "Verksted"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:1498
 msgid "Edit Car Repair"
 msgstr "Rediger verksted"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:1505
 msgid "Tyres"
 msgstr ""
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:1506
 msgid "Edit Tyres"
 msgstr ""
@@ -28963,5 +29182,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:2244 build/trans_presets.java:2347
+#: build/trans_presets.java:1512 build/trans_presets.java:1564
 msgid "Contact:"
 msgstr ""
@@ -29005,15 +29224,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: 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
+#: build/trans_presets.java:1513 build/trans_presets.java:1565
+#: build/trans_presets.java:1791 build/trans_presets.java:1809
+#: build/trans_presets.java:1825 build/trans_presets.java:1842
+#: build/trans_presets.java:1860 build/trans_presets.java:1877
+#: build/trans_presets.java:1899 build/trans_presets.java:1916
+#: build/trans_presets.java:1939 build/trans_presets.java:1958
+#: build/trans_presets.java:1975 build/trans_presets.java:1994
+#: build/trans_presets.java:2013 build/trans_presets.java:2029
+#: build/trans_presets.java:2046 build/trans_presets.java:2061
+#: build/trans_presets.java:2282 build/trans_presets.java:2438
+#: build/trans_presets.java:4041
 msgid "Phone Number"
 msgstr "Telefonnummer"
@@ -29038,14 +29257,14 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: 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
+#: build/trans_presets.java:1514 build/trans_presets.java:1566
+#: build/trans_presets.java:1792 build/trans_presets.java:1810
+#: build/trans_presets.java:1826 build/trans_presets.java:1843
+#: build/trans_presets.java:1861 build/trans_presets.java:1878
+#: build/trans_presets.java:1900 build/trans_presets.java:1917
+#: build/trans_presets.java:1940 build/trans_presets.java:1959
+#: build/trans_presets.java:1976 build/trans_presets.java:1995
+#: build/trans_presets.java:2014 build/trans_presets.java:2030
+#: build/trans_presets.java:2047 build/trans_presets.java:2062
+#: build/trans_presets.java:4042
 msgid "Fax Number"
 msgstr ""
@@ -29072,14 +29291,14 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: 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
+#: build/trans_presets.java:1515 build/trans_presets.java:1567
+#: build/trans_presets.java:1793 build/trans_presets.java:1811
+#: build/trans_presets.java:1827 build/trans_presets.java:1844
+#: build/trans_presets.java:1862 build/trans_presets.java:1879
+#: build/trans_presets.java:1901 build/trans_presets.java:1918
+#: build/trans_presets.java:1941 build/trans_presets.java:1960
+#: build/trans_presets.java:1977 build/trans_presets.java:1996
+#: build/trans_presets.java:2015 build/trans_presets.java:2031
+#: build/trans_presets.java:2048 build/trans_presets.java:2063
+#: build/trans_presets.java:2283 build/trans_presets.java:4044
 msgid "Website"
 msgstr ""
@@ -29104,14 +29323,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: 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
+#: build/trans_presets.java:1516 build/trans_presets.java:1568
+#: build/trans_presets.java:1794 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1863 build/trans_presets.java:1880
+#: build/trans_presets.java:1902 build/trans_presets.java:1919
+#: build/trans_presets.java:1942 build/trans_presets.java:1961
+#: build/trans_presets.java:1978 build/trans_presets.java:1997
+#: build/trans_presets.java:2016 build/trans_presets.java:2032
+#: build/trans_presets.java:2049 build/trans_presets.java:2064
+#: build/trans_presets.java:4045
 msgid "Email Address"
 msgstr ""
@@ -29121,6 +29340,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:2251 build/trans_presets.java:2316
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:1519 build/trans_presets.java:1558
+#: build/trans_presets.java:1586
 msgid "Rental"
 msgstr "Utleie"
@@ -29129,10 +29348,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:1522
 msgid "Edit Car Rental"
 msgstr "Rediger bilutleie"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:1529
 msgid "Sharing"
 msgstr "Bildeling"
@@ -29140,10 +29359,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:1531
 msgid "Edit Car Sharing"
 msgstr "Rediger bildeling"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:1541
 msgid "Edit Motorcycle Parking"
 msgstr ""
@@ -29151,10 +29370,10 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:2284 build/trans_presets.java:2360
+#: build/trans_presets.java:1544 build/trans_presets.java:1577
 msgid "Capacity"
 msgstr "Kapasitet"
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:1548
 msgid "Motorcycle Dealer"
 msgstr ""
@@ -29162,25 +29381,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:1550
 msgid "Edit Shop Motorcycle"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:1553
 msgid "independent"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:1556
 msgid "Services:"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:1557
 msgid "Sale"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:1557
 msgctxt "motorcycle"
 msgid "yes"
@@ -29188,5 +29407,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:1557
 msgctxt "motorcycle"
 msgid "brand"
@@ -29194,5 +29413,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:1557
 msgctxt "motorcycle"
 msgid "used"
@@ -29200,5 +29419,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:1557
 msgctxt "motorcycle"
 msgid "no"
@@ -29209,6 +29428,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:2318 build/trans_presets.java:2323
-#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:1558 build/trans_presets.java:1559
+#: build/trans_presets.java:1561 build/trans_presets.java:1562
 msgid "brand"
 msgstr ""
@@ -29216,35 +29435,35 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:2324 build/trans_presets.java:2338
+#: build/trans_presets.java:1559 build/trans_presets.java:1561
 msgid "oldtimer"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:1560
 msgid "Safety inspection"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:1560
 msgid "DEKRA"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:1560
 msgid "GTÜ"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:1560
 msgid "MOT"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:1560
 msgid "TÜV"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:1561
 msgid "Parts"
 msgstr ""
@@ -29254,6 +29473,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:2341 build/trans_presets.java:3796
-#: build/trans_presets.java:5145 build/trans_presets.java:5146
+#: build/trans_presets.java:1562 build/trans_presets.java:2502
+#: build/trans_presets.java:3285 build/trans_presets.java:3286
 msgid "Clothes"
 msgstr "Klær"
@@ -29261,10 +29480,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1574
 msgid "Edit Bicycle Parking"
 msgstr "Rediger sykkelparkering"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:1579
 msgid "Bike Dealer"
 msgstr "Sykkelforretning"
@@ -29273,5 +29492,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:1582
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelforretning"
@@ -29280,10 +29499,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1589
 msgid "Edit Bicycle Rental"
 msgstr "Rediger sykkelutleie"
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:1595
 msgctxt "railway"
 msgid "Station"
@@ -29293,5 +29512,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1598
 msgctxt "railway"
 msgid "Edit Station"
@@ -29299,5 +29518,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:1603
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -29305,5 +29524,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:1606
 msgid "Railway Halt"
 msgstr ""
@@ -29311,5 +29530,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:1608
 msgid "Edit Halt"
 msgstr "Rediger jernbanestopp"
@@ -29317,5 +29536,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:1615
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -29324,5 +29543,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:2401
+#: build/trans_presets.java:1618
 msgid "Edit Tram Stop"
 msgstr "Rediger trikkestopp"
@@ -29330,5 +29549,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:1625
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -29337,5 +29556,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:2411
+#: build/trans_presets.java:1628
 msgid "Edit Railway Platform"
 msgstr "Rediger jernbaneplattform"
@@ -29347,5 +29566,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:2414 build/trans_presets.java:2468
+#: build/trans_presets.java:1631 build/trans_presets.java:1676
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -29353,10 +29572,10 @@
 #. item "Public Transport/Railway Platform" check "Area"
 #. item "Public Transport/Bus Platform" check "Area"
-#: build/trans_presets.java:2416 build/trans_presets.java:2470
+#: build/trans_presets.java:1633 build/trans_presets.java:1678
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:1635
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -29365,5 +29584,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:2421
+#: build/trans_presets.java:1638
 msgid "Edit Subway Entrance"
 msgstr "Rediger T-baneinngang"
@@ -29371,5 +29590,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:2426 build/trans_presets.java:3735
+#: build/trans_presets.java:1643 build/trans_presets.java:2459
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -29378,5 +29597,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:1648
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -29385,5 +29604,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:2434
+#: build/trans_presets.java:1651
 msgid "Edit Bus Station"
 msgstr "Rediger busstasjon"
@@ -29391,5 +29610,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:1657
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -29399,5 +29618,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:2444
+#: build/trans_presets.java:1661
 msgid "Edit Bus Stop"
 msgstr "Rediger bussholdeplass"
@@ -29406,6 +29625,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:2449 build/trans_presets.java:3832
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:1666 build/trans_presets.java:2521
+#: build/trans_presets.java:2531
 msgid "Shelter"
 msgstr "Ly"
@@ -29415,10 +29634,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:2453 build/trans_presets.java:3807
+#: build/trans_presets.java:1667 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Benk"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:1668
 msgid "Tactile Paving"
 msgstr ""
@@ -29426,10 +29645,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:1672
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:1673
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -29437,10 +29656,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:1681
 msgid "Ticket Machine"
 msgstr ""
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:1687
 msgid "Reference Number"
 msgstr ""
@@ -29449,6 +29668,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:2480 build/trans_presets.java:3753
-#: build/trans_presets.java:5650
+#: build/trans_presets.java:1688 build/trans_presets.java:2473
+#: build/trans_presets.java:3610
 msgid "Coins"
 msgstr "Mynter"
@@ -29457,6 +29676,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:2481 build/trans_presets.java:3754
-#: build/trans_presets.java:5651
+#: build/trans_presets.java:1689 build/trans_presets.java:2474
+#: build/trans_presets.java:3611
 msgid "Notes"
 msgstr "Sedler"
@@ -29465,6 +29684,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2482 build/trans_presets.java:3755
-#: build/trans_presets.java:5652
+#: build/trans_presets.java:1690 build/trans_presets.java:2475
+#: build/trans_presets.java:3612
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -29473,6 +29692,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:2483 build/trans_presets.java:3756
-#: build/trans_presets.java:5653
+#: build/trans_presets.java:1691 build/trans_presets.java:2476
+#: build/trans_presets.java:3613
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -29481,6 +29700,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:2484 build/trans_presets.java:3757
-#: build/trans_presets.java:5654
+#: build/trans_presets.java:1692 build/trans_presets.java:2477
+#: build/trans_presets.java:3614
 msgid "Credit cards"
 msgstr "Kredittkort"
@@ -29488,10 +29707,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2485 build/trans_presets.java:5655
+#: build/trans_presets.java:1693 build/trans_presets.java:3615
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Taxi"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:1696
 msgid "Taxi"
 msgstr "Taxi"
@@ -29499,5 +29718,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:1698
 msgid "Edit Taxi station"
 msgstr "Rediger taxi-stasjon"
@@ -29505,10 +29724,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:1703
 msgid "Airport"
 msgstr "Flyplass"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:1704
 msgid "Airport Ground"
 msgstr ""
@@ -29516,5 +29735,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1706
 msgid "Edit Airport Ground"
 msgstr ""
@@ -29522,10 +29741,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:1710
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:1711
 msgid "ICAO"
 msgstr "ICAO"
@@ -29534,5 +29753,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:1716
 msgid "Runway"
 msgstr "Rullebane"
@@ -29540,5 +29759,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:1718
 msgid "Edit Runway"
 msgstr "Rediger rullebane"
@@ -29546,5 +29765,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:1724
 msgid "Taxiway"
 msgstr "Taksebane"
@@ -29552,5 +29771,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:1726
 msgid "Edit Taxiway"
 msgstr "Rediger taksebane"
@@ -29558,5 +29777,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:1732
 msgid "Helipad"
 msgstr "Helikopterdekk"
@@ -29564,5 +29783,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:1734
 msgid "Edit Helipad"
 msgstr "Rediger helikopterdekk"
@@ -29572,5 +29791,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:2532 build/trans_presets.java:2534
+#: build/trans_presets.java:1740 build/trans_presets.java:1742
 msgid "Apron"
 msgstr "Oppstillingsplass"
@@ -29580,5 +29799,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:2537 build/trans_presets.java:2539
+#: build/trans_presets.java:1745 build/trans_presets.java:1747
 msgid "Hangar"
 msgstr "Hangar"
@@ -29589,6 +29808,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:2542 build/trans_presets.java:2544
-#: build/trans_presets.java:4779
+#: build/trans_presets.java:1750 build/trans_presets.java:1752
+#: build/trans_presets.java:3016
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -29598,5 +29817,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:2547 build/trans_presets.java:2549
+#: build/trans_presets.java:1755 build/trans_presets.java:1757
 msgid "Windsock"
 msgstr "Vindpølse"
@@ -29605,5 +29824,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:2553
+#: build/trans_presets.java:1761
 msgid "Terminal"
 msgstr "Terminal"
@@ -29611,10 +29830,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:1763
 msgid "Edit Terminal"
 msgstr "Rediger terminal"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:1767
 msgctxt "airport"
 msgid "Gate"
@@ -29623,15 +29842,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:1769
 msgid "Edit Terminal Gate"
 msgstr "Rediger terminalutgang"
 
 #. group "Facilities"
-#: build/trans_presets.java:2567 build/trans_presets.java:3724
+#: build/trans_presets.java:1775 build/trans_presets.java:2451
 msgid "Facilities"
 msgstr ""
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:1776
 msgid "Accommodation"
 msgstr ""
@@ -29643,5 +29862,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:2569 build/trans_surveyor.java:43
+#: build/trans_presets.java:1777 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -29650,5 +29869,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:1780
 msgid "Edit Hotel"
 msgstr "Rediger hotell"
@@ -29662,8 +29881,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: 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
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1818 build/trans_presets.java:1835
+#: build/trans_presets.java:1853 build/trans_presets.java:1887
+#: build/trans_presets.java:1909 build/trans_presets.java:1932
 msgid "Stars"
 msgstr "Stjerner"
@@ -29699,12 +29918,12 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: 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
+#: build/trans_presets.java:1786 build/trans_presets.java:1804
+#: build/trans_presets.java:1820 build/trans_presets.java:1837
+#: build/trans_presets.java:1855 build/trans_presets.java:1872
+#: build/trans_presets.java:1889 build/trans_presets.java:1911
+#: build/trans_presets.java:1934 build/trans_presets.java:1953
+#: build/trans_presets.java:1970 build/trans_presets.java:1989
+#: build/trans_presets.java:2008 build/trans_presets.java:2024
+#: build/trans_presets.java:2041
 msgid "Internet access"
 msgstr ""
@@ -29725,12 +29944,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: 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
+#: build/trans_presets.java:1786 build/trans_presets.java:1804
+#: build/trans_presets.java:1820 build/trans_presets.java:1837
+#: build/trans_presets.java:1855 build/trans_presets.java:1872
+#: build/trans_presets.java:1889 build/trans_presets.java:1911
+#: build/trans_presets.java:1934 build/trans_presets.java:1953
+#: build/trans_presets.java:1970 build/trans_presets.java:1989
+#: build/trans_presets.java:2008 build/trans_presets.java:2024
+#: build/trans_presets.java:2041
 msgid "wlan"
 msgstr ""
@@ -29751,12 +29970,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: 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
+#: build/trans_presets.java:1786 build/trans_presets.java:1804
+#: build/trans_presets.java:1820 build/trans_presets.java:1837
+#: build/trans_presets.java:1855 build/trans_presets.java:1872
+#: build/trans_presets.java:1889 build/trans_presets.java:1911
+#: build/trans_presets.java:1934 build/trans_presets.java:1953
+#: build/trans_presets.java:1970 build/trans_presets.java:1989
+#: build/trans_presets.java:2008 build/trans_presets.java:2024
+#: build/trans_presets.java:2041
 msgid "wired"
 msgstr ""
@@ -29783,12 +30002,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: 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
+#: build/trans_presets.java:1786 build/trans_presets.java:1804
+#: build/trans_presets.java:1820 build/trans_presets.java:1837
+#: build/trans_presets.java:1855 build/trans_presets.java:1872
+#: build/trans_presets.java:1889 build/trans_presets.java:1911
+#: build/trans_presets.java:1934 build/trans_presets.java:1953
+#: build/trans_presets.java:1970 build/trans_presets.java:1989
+#: build/trans_presets.java:2008 build/trans_presets.java:2024
+#: build/trans_presets.java:2041 build/trans_style.java:1064
 msgid "terminal"
 msgstr "stasjon"
@@ -29809,12 +30028,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: 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
+#: build/trans_presets.java:1787 build/trans_presets.java:1805
+#: build/trans_presets.java:1821 build/trans_presets.java:1838
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1890 build/trans_presets.java:1912
+#: build/trans_presets.java:1935 build/trans_presets.java:1954
+#: build/trans_presets.java:1971 build/trans_presets.java:1990
+#: build/trans_presets.java:2009 build/trans_presets.java:2025
+#: build/trans_presets.java:2042
 msgid "Internet access fee"
 msgstr ""
@@ -29837,12 +30056,12 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: 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
+#: build/trans_presets.java:1788 build/trans_presets.java:1806
+#: build/trans_presets.java:1822 build/trans_presets.java:1839
+#: build/trans_presets.java:1857 build/trans_presets.java:1874
+#: build/trans_presets.java:1891 build/trans_presets.java:1913
+#: build/trans_presets.java:1936 build/trans_presets.java:1955
+#: build/trans_presets.java:1972 build/trans_presets.java:1991
+#: build/trans_presets.java:2010 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2058
 msgid "Smoking"
 msgstr ""
@@ -29864,12 +30083,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: 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
+#: build/trans_presets.java:1788 build/trans_presets.java:1806
+#: build/trans_presets.java:1822 build/trans_presets.java:1839
+#: build/trans_presets.java:1857 build/trans_presets.java:1874
+#: build/trans_presets.java:1891 build/trans_presets.java:1913
+#: build/trans_presets.java:1936 build/trans_presets.java:1955
+#: build/trans_presets.java:1972 build/trans_presets.java:1991
+#: build/trans_presets.java:2010 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2058
 msgid "dedicated"
 msgstr ""
@@ -29891,12 +30110,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: 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
+#: build/trans_presets.java:1788 build/trans_presets.java:1806
+#: build/trans_presets.java:1822 build/trans_presets.java:1839
+#: build/trans_presets.java:1857 build/trans_presets.java:1874
+#: build/trans_presets.java:1891 build/trans_presets.java:1913
+#: build/trans_presets.java:1936 build/trans_presets.java:1955
+#: build/trans_presets.java:1972 build/trans_presets.java:1991
+#: build/trans_presets.java:2010 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2058
 msgid "separated"
 msgstr ""
@@ -29918,17 +30137,17 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: 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
+#: build/trans_presets.java:1788 build/trans_presets.java:1806
+#: build/trans_presets.java:1822 build/trans_presets.java:1839
+#: build/trans_presets.java:1857 build/trans_presets.java:1874
+#: build/trans_presets.java:1891 build/trans_presets.java:1913
+#: build/trans_presets.java:1936 build/trans_presets.java:1955
+#: build/trans_presets.java:1972 build/trans_presets.java:1991
+#: build/trans_presets.java:2010 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2058
 msgid "isolated"
 msgstr ""
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:1796
 msgid "Motel"
 msgstr "Motell"
@@ -29936,20 +30155,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:1798
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:1814
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:1815
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:1830
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -29957,10 +30176,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:1832
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:1847
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -29968,15 +30187,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:1849
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:1865
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:1866
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
@@ -29984,10 +30203,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1883
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:1884
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
@@ -29995,30 +30214,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:1894
 msgid "Number of places"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1895
 msgid "Requires a fee"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:1895
 msgid "interval"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:1896
 msgid "Power supply"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:1897
 msgid "Tents allowed"
 msgstr ""
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:1904
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -30026,10 +30245,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:2834
+#: build/trans_presets.java:1906
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:1922
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -30040,5 +30259,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:2870 build/trans_surveyor.java:47
+#: build/trans_presets.java:1923 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -30046,5 +30265,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:1925
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
@@ -30053,6 +30272,6 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:2876 build/trans_presets.java:2938
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
+#: build/trans_presets.java:1986
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -30060,5 +30279,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2877 build/trans_presets.java:2939
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "italian"
 msgstr "italiensk"
@@ -30066,5 +30285,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2878 build/trans_presets.java:2940
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "chinese"
 msgstr "kinesisk"
@@ -30072,5 +30291,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2879 build/trans_presets.java:2941
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "pizza"
 msgstr "pizza"
@@ -30078,5 +30297,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2880 build/trans_presets.java:2942
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "burger"
 msgstr "gatekjøkken"
@@ -30084,5 +30303,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2881 build/trans_presets.java:2943
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "greek"
 msgstr "gresk"
@@ -30090,5 +30309,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2882 build/trans_presets.java:2944
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "german"
 msgstr "tysk"
@@ -30096,5 +30315,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2883 build/trans_presets.java:2945
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "indian"
 msgstr "indisk"
@@ -30102,5 +30321,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2884 build/trans_presets.java:2946
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "regional"
 msgstr "lokal"
@@ -30108,5 +30327,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2885 build/trans_presets.java:2947
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "kebab"
 msgstr "kebab"
@@ -30114,5 +30333,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2886 build/trans_presets.java:2948
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "turkish"
 msgstr "tyrkisk"
@@ -30120,5 +30339,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2887 build/trans_presets.java:2949
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "asian"
 msgstr "asiatisk"
@@ -30126,5 +30345,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2888 build/trans_presets.java:2950
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "thai"
 msgstr "thai"
@@ -30132,5 +30351,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2889 build/trans_presets.java:2951
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "mexican"
 msgstr "meksikansk"
@@ -30138,5 +30357,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2890 build/trans_presets.java:2952
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "japanese"
 msgstr "japansk"
@@ -30144,5 +30363,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2891 build/trans_presets.java:2953
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "french"
 msgstr ""
@@ -30150,5 +30369,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2892 build/trans_presets.java:2954
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "sandwich"
 msgstr ""
@@ -30156,5 +30375,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2893 build/trans_presets.java:2955
+#: build/trans_presets.java:1929 build/trans_presets.java:1950
 msgid "sushi"
 msgstr ""
@@ -30162,10 +30381,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:2895 build/trans_presets.java:3081
+#: build/trans_presets.java:1930 build/trans_presets.java:2005
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:1944
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -30173,20 +30392,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:2934
+#: build/trans_presets.java:1946
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:1950
 msgid "fish_and_chips"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:1950
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:1963
 msgid "Food Court"
 msgstr ""
@@ -30194,10 +30413,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:2995
+#: build/trans_presets.java:1965
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:1980
 msgid "Cafe"
 msgstr "Kafé"
@@ -30205,15 +30424,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:1982
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:1986
 msgid "ice_cream"
 msgstr ""
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:1999
 msgid "Pub"
 msgstr "Pub"
@@ -30221,20 +30440,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2001
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:3116
+#: build/trans_presets.java:2018
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:2019
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:2034
 msgid "Bar"
 msgstr "Bar"
@@ -30242,10 +30461,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:2036
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:2051
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -30253,25 +30472,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:2053
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
 #. group "Tourism"
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:2067
 msgid "Tourism"
 msgstr "Turisme"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:2068
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:2069
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:2074
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -30279,10 +30498,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:2076
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:2079
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
@@ -30290,20 +30509,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:2082
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:3248
+#: build/trans_presets.java:2089
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:3253
+#: build/trans_presets.java:2094
 msgid "Detail Grade"
 msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:3254
+#: build/trans_presets.java:2094
 msgid "topo"
 msgstr "Topografisk"
@@ -30336,5 +30555,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:3255 build/trans_presets.java:6294
+#: build/trans_presets.java:2094 build/trans_presets.java:4144
 #: build/trans_style.java:472 build/trans_style.java:484
 #: build/trans_style.java:496 build/trans_style.java:502
@@ -30343,25 +30562,25 @@
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:2094
 msgid "scheme"
 msgstr "Diagram"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:2095
 msgid "Shown Area"
 msgstr "Synlig område"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:2095
 msgid "site"
 msgstr "Sted"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:2095
 msgid "city"
 msgstr "By"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:2095
 msgid "region"
 msgstr "Region"
@@ -30370,6 +30589,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:3263 build/trans_presets.java:3285
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:2096 build/trans_presets.java:2112
+#: build/trans_presets.java:2156
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
@@ -30379,5 +30598,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:3265 build/trans_presets.java:3294
+#: build/trans_presets.java:2098 build/trans_presets.java:2121
 msgid "Routes shown for:"
 msgstr "Ruter for:"
@@ -30385,5 +30604,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:3266 build/trans_presets.java:3295
+#: build/trans_presets.java:2099 build/trans_presets.java:2122
 msgid "Hiking"
 msgstr "Tursti"
@@ -30392,6 +30611,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:3267 build/trans_presets.java:3296
-#: build/trans_presets.java:4152
+#: build/trans_presets.java:2100 build/trans_presets.java:2123
+#: build/trans_presets.java:2639
 msgid "Cycling"
 msgstr "Sykling"
@@ -30399,5 +30618,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:3268 build/trans_presets.java:3297
+#: build/trans_presets.java:2101 build/trans_presets.java:2124
 msgid "Mountainbiking"
 msgstr "Fjellsykling"
@@ -30406,6 +30625,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:3269 build/trans_presets.java:3298
-#: build/trans_presets.java:4240
+#: build/trans_presets.java:2102 build/trans_presets.java:2125
+#: build/trans_presets.java:2687
 msgid "Skiing"
 msgstr "Ski"
@@ -30413,5 +30632,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:3270 build/trans_presets.java:3299
+#: build/trans_presets.java:2103 build/trans_presets.java:2126
 msgid "Riding"
 msgstr "Riding"
@@ -30419,50 +30638,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:3271 build/trans_presets.java:3300
+#: build/trans_presets.java:2104 build/trans_presets.java:2127
 msgid "... other transportation modes possible"
 msgstr "… andre typer transport mulig"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:2106
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:2111
 msgid "Board Content"
 msgstr "Tavleinnhold"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:2111
 msgid "notice"
 msgstr "Merknad"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:2111
 msgid "history"
 msgstr "Historisk"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:2111
 msgid "nature"
 msgstr "Natur"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:2111
 msgid "wildlife"
 msgstr "Dyreliv"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:2111
 msgid "plants"
 msgstr "Planter"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:3287
+#: build/trans_presets.java:2114
 msgid "Guidepost"
 msgstr "Veiviser"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:3302
+#: build/trans_presets.java:2129
 msgid "Information Terminal"
 msgstr "Informasjonsterminal"
@@ -30470,10 +30689,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:3307 build/trans_presets.java:3320
+#: build/trans_presets.java:2134 build/trans_presets.java:2144
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:2139
 msgid "Audioguide"
 msgstr "Lydomviser"
@@ -30481,25 +30700,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:2149
 msgid "Audioguide via mobile phone?"
 msgstr "Lydomvisning via mobiltelefon"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:2150
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:3331
+#: build/trans_presets.java:2152
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. group "Leisure"
-#: build/trans_presets.java:3338
+#: build/trans_presets.java:2159
 msgid "Leisure"
 msgstr "Fritid"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:3339
+#: build/trans_presets.java:2160
 msgid "Cinema"
 msgstr "Kino"
@@ -30508,10 +30727,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:2163
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:2167
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -30520,30 +30739,30 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:3349
+#: build/trans_presets.java:2170
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:3359
+#: build/trans_presets.java:2176
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:2177
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:2182
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:3370
+#: build/trans_presets.java:2183
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:3374
+#: build/trans_presets.java:2187
 msgid "Sauna"
 msgstr ""
@@ -30553,5 +30772,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:3375 build/trans_presets.java:3378
+#: build/trans_presets.java:2188 build/trans_presets.java:2191
 msgid "Edit Sauna"
 msgstr ""
@@ -30579,15 +30798,15 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: 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
+#: build/trans_presets.java:2196 build/trans_presets.java:2306
+#: build/trans_presets.java:2414 build/trans_presets.java:3227
+#: build/trans_presets.java:3236 build/trans_presets.java:3253
+#: build/trans_presets.java:3262 build/trans_presets.java:3299
+#: build/trans_presets.java:3348 build/trans_presets.java:3371
+#: build/trans_presets.java:3380 build/trans_presets.java:3427
+#: build/trans_presets.java:3436 build/trans_presets.java:3464
+#: build/trans_presets.java:3473 build/trans_presets.java:3512
+#: build/trans_presets.java:3528 build/trans_presets.java:3537
+#: build/trans_presets.java:3546 build/trans_presets.java:3562
+#: build/trans_presets.java:3584 build/trans_presets.java:3599
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -30595,5 +30814,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:3395
+#: build/trans_presets.java:2200
 msgid "Playground"
 msgstr "Lekeplass"
@@ -30601,15 +30820,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:2202
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:3401
+#: build/trans_presets.java:2206
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:3402
+#: build/trans_presets.java:2207
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
@@ -30617,10 +30836,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:3405 build/trans_presets.java:3836
+#: build/trans_presets.java:2210 build/trans_presets.java:2525
 msgid "Fireplace"
 msgstr "Bålplass"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:2212
 msgid "Public Grill"
 msgstr ""
@@ -30628,15 +30847,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:3409
+#: build/trans_presets.java:2214
 msgid "Edit Public Grill"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:3413
+#: build/trans_presets.java:2218
 msgid "Covered"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:2219
 msgctxt "grill"
 msgid "Fuel"
@@ -30644,30 +30863,30 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:3418
+#: build/trans_presets.java:2219
 msgid "charcoal"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:2219
 msgid "electric"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:2221
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:3424
+#: build/trans_presets.java:2222
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. group "Culture"
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:2227
 msgid "Culture"
 msgstr ""
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2228
 msgid "Museum"
 msgstr "Museum"
@@ -30675,10 +30894,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:3432
+#: build/trans_presets.java:2230
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:2236
 msgid "Theatre"
 msgstr "Teater"
@@ -30687,10 +30906,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:3445
+#: build/trans_presets.java:2239
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:2243
 msgid "Library"
 msgstr "Bibliotek"
@@ -30699,10 +30918,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:2246
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:2251
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -30710,10 +30929,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:2253
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:3467
+#: build/trans_presets.java:2257
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -30721,10 +30940,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:3469
+#: build/trans_presets.java:2259
 msgid "Edit Artwork"
 msgstr "Rediger kunstverk"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:2263
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -30734,5 +30953,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:3477
+#: build/trans_presets.java:2267
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -30741,6 +30960,6 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:3480 build/trans_presets.java:5980
-#: build/trans_presets.java:6018
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "Religion"
 msgstr "Religion"
@@ -30749,6 +30968,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3481 build/trans_presets.java:5981
-#: build/trans_presets.java:6019
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "bahai"
 msgstr "bahai"
@@ -30757,6 +30976,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3482 build/trans_presets.java:5982
-#: build/trans_presets.java:6020
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "buddhist"
 msgstr "buddhist"
@@ -30765,6 +30984,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3483 build/trans_presets.java:5983
-#: build/trans_presets.java:6021
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "christian"
 msgstr "kristen"
@@ -30773,6 +30992,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3484 build/trans_presets.java:5984
-#: build/trans_presets.java:6022
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "hindu"
 msgstr "hindu"
@@ -30781,6 +31000,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3485 build/trans_presets.java:5985
-#: build/trans_presets.java:6023
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "jain"
 msgstr "jain"
@@ -30789,6 +31008,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3486 build/trans_presets.java:5986
-#: build/trans_presets.java:6024
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "jewish"
 msgstr "jødisk"
@@ -30797,6 +31016,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3487 build/trans_presets.java:5987
-#: build/trans_presets.java:6025
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "muslim"
 msgstr "muslim"
@@ -30805,6 +31024,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3488 build/trans_presets.java:5988
-#: build/trans_presets.java:6026
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "sikh"
 msgstr "sikh"
@@ -30813,6 +31032,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3489 build/trans_presets.java:5989
-#: build/trans_presets.java:6027
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "spiritualist"
 msgstr "spiritualist"
@@ -30821,6 +31040,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3490 build/trans_presets.java:5990
-#: build/trans_presets.java:6028
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "taoist"
 msgstr "taoist"
@@ -30829,6 +31048,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3491 build/trans_presets.java:5991
-#: build/trans_presets.java:6029
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "unitarian"
 msgstr "unitarisk"
@@ -30837,6 +31056,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:3492 build/trans_presets.java:5992
-#: build/trans_presets.java:6030
+#: build/trans_presets.java:2270 build/trans_presets.java:3932
+#: build/trans_presets.java:3941
 msgid "zoroastrian"
 msgstr "zoroastrisk"
@@ -30845,6 +31064,6 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:3494 build/trans_presets.java:5994
-#: build/trans_presets.java:6032
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -30853,6 +31072,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3495 build/trans_presets.java:5995
-#: build/trans_presets.java:6033
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "anglican"
 msgstr "anglikansk"
@@ -30861,6 +31080,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3496 build/trans_presets.java:5996
-#: build/trans_presets.java:6034
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "baptist"
 msgstr "baptist"
@@ -30869,6 +31088,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3497 build/trans_presets.java:5997
-#: build/trans_presets.java:6035
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "catholic"
 msgstr "katolsk"
@@ -30877,6 +31096,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3498 build/trans_presets.java:5998
-#: build/trans_presets.java:6036
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "evangelical"
 msgstr "evangelisk"
@@ -30885,6 +31104,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3499 build/trans_presets.java:5999
-#: build/trans_presets.java:6037
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
@@ -30893,6 +31112,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3500 build/trans_presets.java:6000
-#: build/trans_presets.java:6038
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "lutheran"
 msgstr "luthersk"
@@ -30901,6 +31120,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3501 build/trans_presets.java:6001
-#: build/trans_presets.java:6039
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "methodist"
 msgstr "metodist"
@@ -30909,6 +31128,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3502 build/trans_presets.java:6002
-#: build/trans_presets.java:6040
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "mormon"
 msgstr "mormoner"
@@ -30917,6 +31136,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3503 build/trans_presets.java:6003
-#: build/trans_presets.java:6041
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "orthodox"
 msgstr "ortodoks"
@@ -30925,6 +31144,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3504 build/trans_presets.java:6004
-#: build/trans_presets.java:6042
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
@@ -30933,6 +31152,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3505 build/trans_presets.java:6005
-#: build/trans_presets.java:6043
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "presbyterian"
 msgstr "presbyteriansk"
@@ -30941,6 +31160,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3506 build/trans_presets.java:6006
-#: build/trans_presets.java:6044
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "protestant"
 msgstr "protestant"
@@ -30949,6 +31168,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3507 build/trans_presets.java:6007
-#: build/trans_presets.java:6045
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "quaker"
 msgstr "quaker"
@@ -30957,6 +31176,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3508 build/trans_presets.java:6008
-#: build/trans_presets.java:6046
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "shia"
 msgstr "shia"
@@ -30965,11 +31184,11 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:3509 build/trans_presets.java:6009
-#: build/trans_presets.java:6047
+#: build/trans_presets.java:2271 build/trans_presets.java:3933
+#: build/trans_presets.java:3942
 msgid "sunni"
 msgstr "sunni"
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:2274
 msgid "Recording Studio"
 msgstr ""
@@ -30977,15 +31196,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:3519
+#: build/trans_presets.java:2276
 msgid "Edit Studio"
 msgstr ""
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:3525
+#: build/trans_presets.java:2281
 msgid "audio"
 msgstr ""
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:3526
+#: build/trans_presets.java:2281
 msgid "video"
 msgstr ""
@@ -30993,5 +31212,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:3532 build/trans_presets.java:3533
+#: build/trans_presets.java:2286 build/trans_presets.java:2287
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -30999,10 +31218,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:3535
+#: build/trans_presets.java:2289
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:3539
+#: build/trans_presets.java:2293
 msgid "Town hall"
 msgstr "Rådhus"
@@ -31010,5 +31229,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:2295
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
@@ -31017,10 +31236,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:3545 build/trans_presets.java:3547
+#: build/trans_presets.java:2299 build/trans_presets.java:2301
 msgid "Community Centre"
 msgstr ""
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:3558
+#: build/trans_presets.java:2308
 msgid "Embassy"
 msgstr "Ambassade"
@@ -31028,10 +31247,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:3560
+#: build/trans_presets.java:2310
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:2314
 msgid "Courthouse"
 msgstr "Domstol"
@@ -31040,10 +31259,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:3567
+#: build/trans_presets.java:2317
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:2321
 msgid "Prison"
 msgstr "Fengsel"
@@ -31052,10 +31271,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:3574
+#: build/trans_presets.java:2324
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:3578
+#: build/trans_presets.java:2328
 msgid "Police"
 msgstr "Politi"
@@ -31065,10 +31284,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:3582
+#: build/trans_presets.java:2332
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:2336
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -31077,10 +31296,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:3589
+#: build/trans_presets.java:2339
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:3593
+#: build/trans_presets.java:2343
 msgid "Post Office"
 msgstr "Postkontor"
@@ -31088,25 +31307,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:3595
+#: build/trans_presets.java:2345
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
 
 #. group "Education"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:2351
 msgid "Education"
 msgstr ""
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:3602
+#: build/trans_presets.java:2352
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:3603
+#: build/trans_presets.java:2353
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Education/School"
-#: build/trans_presets.java:3607
+#: build/trans_presets.java:2357
 msgid "School"
 msgstr "Skole"
@@ -31114,10 +31333,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:2359
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Education/University"
-#: build/trans_presets.java:3613
+#: build/trans_presets.java:2363
 msgid "University"
 msgstr "Universitet"
@@ -31125,10 +31344,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:3615
+#: build/trans_presets.java:2365
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Education/College"
-#: build/trans_presets.java:3619
+#: build/trans_presets.java:2369
 msgid "College"
 msgstr "Høyskole"
@@ -31136,10 +31355,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:3621
+#: build/trans_presets.java:2371
 msgid "Edit College"
 msgstr "Rediger høyskole"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:3625
+#: build/trans_presets.java:2375
 msgid "Driving School"
 msgstr ""
@@ -31147,20 +31366,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:3627
+#: build/trans_presets.java:2377
 msgid "Edit Driving School"
 msgstr ""
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:3632
+#: build/trans_presets.java:2382
 msgid "License Classes"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:3635
+#: build/trans_presets.java:2385
 msgid "Health"
 msgstr "Helse"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:3636
+#: build/trans_presets.java:2386
 msgid "Doctors"
 msgstr "Lege"
@@ -31168,20 +31387,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:2388
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:3647
+#: build/trans_presets.java:2393
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:3648
+#: build/trans_presets.java:2394
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:3657
+#: build/trans_presets.java:2399
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -31189,5 +31408,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:2401
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -31195,10 +31414,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:3661
+#: build/trans_presets.java:2403
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:3672
+#: build/trans_presets.java:2407
 msgid "Hearing Aids"
 msgstr ""
@@ -31206,10 +31425,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:3674
+#: build/trans_presets.java:2409
 msgid "Edit Hearing Aids"
 msgstr ""
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:3685
+#: build/trans_presets.java:2416
 msgid "Hospital"
 msgstr "Sykehus"
@@ -31217,10 +31436,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:3687
+#: build/trans_presets.java:2418
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:3691
+#: build/trans_presets.java:2422
 msgid "Baby Hatch"
 msgstr "Babyboks"
@@ -31228,10 +31447,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:3693
+#: build/trans_presets.java:2424
 msgid "Edit Baby Hatch"
 msgstr "Rediger babyboks"
 
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:3698
+#: build/trans_presets.java:2429
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -31240,5 +31459,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:3701
+#: build/trans_presets.java:2432
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -31247,15 +31466,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:2435
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:3705
+#: build/trans_presets.java:2436
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:3708
+#: build/trans_presets.java:2439
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -31263,5 +31482,5 @@
 #. <space />
 #. item "Health/Veterinary"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:2442
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -31270,10 +31489,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:3714
+#: build/trans_presets.java:2445
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:3737
+#: build/trans_presets.java:2459
 msgid "limited"
 msgstr "begrenset"
@@ -31281,15 +31500,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:3740 build/trans_presets.java:5649
+#: build/trans_presets.java:2460 build/trans_presets.java:3609
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:3742
+#: build/trans_presets.java:2462
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:3747
+#: build/trans_presets.java:2467
 msgid "Telephone"
 msgstr "Telefon"
@@ -31298,15 +31517,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:3750
+#: build/trans_presets.java:2470
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:3758
+#: build/trans_presets.java:2478
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:3760
+#: build/trans_presets.java:2480
 msgid "Clock"
 msgstr ""
@@ -31315,5 +31534,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:2483
 msgid "Edit Clock"
 msgstr ""
@@ -31323,5 +31542,5 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:3766 build/trans_presets.java:4813
+#: build/trans_presets.java:2486 build/trans_presets.java:3038
 msgid "Display"
 msgstr ""
@@ -31329,5 +31548,5 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:3767 build/trans_presets.java:4814
+#: build/trans_presets.java:2486 build/trans_presets.java:3038
 msgid "analog"
 msgstr ""
@@ -31335,75 +31554,75 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:3768 build/trans_presets.java:4815
+#: build/trans_presets.java:2486 build/trans_presets.java:3038
 msgid "digital"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:3769
+#: build/trans_presets.java:2486
 msgid "sundial"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:3770
+#: build/trans_presets.java:2486
 msgid "unorthodox"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:3772
+#: build/trans_presets.java:2487
 msgid "Support"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:3773
+#: build/trans_presets.java:2487
 msgid "pole"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:3774
+#: build/trans_presets.java:2487
 msgid "wall_mounted"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:3775
+#: build/trans_presets.java:2487
 msgid "billboard"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:3778
+#: build/trans_presets.java:2488
 msgid "Visibility/readability"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:3779
+#: build/trans_presets.java:2488
 msgid "(up to 5m)"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:3780
+#: build/trans_presets.java:2488
 msgid "(up to 20m)"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:3781
+#: build/trans_presets.java:2488
 msgid "(more than 20m)"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:3783
+#: build/trans_presets.java:2489
 msgid "Shows current date"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:2490
 msgid "Shows temperature"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:2491
 msgid "Shows barometric pressure"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:3786
+#: build/trans_presets.java:2492
 msgid "Shows humidity"
 msgstr ""
@@ -31411,5 +31630,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:3789
+#: build/trans_presets.java:2495
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -31418,5 +31637,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:3792
+#: build/trans_presets.java:2498
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -31424,30 +31643,30 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:3794
+#: build/trans_presets.java:2500
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:3795
+#: build/trans_presets.java:2501
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:3797
+#: build/trans_presets.java:2503
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:3798
+#: build/trans_presets.java:2504
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:2505
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:3801
+#: build/trans_presets.java:2507
 msgid "Waste Basket"
 msgstr "Søppeldunk"
@@ -31455,5 +31674,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:3803
+#: build/trans_presets.java:2509
 msgid "Edit Waste Basket"
 msgstr "Rediger søppeldunk"
@@ -31462,35 +31681,35 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:3810
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Ryggstø"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:3814
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Material"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:3815
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "stein"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:3818
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plast"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:3820
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Farge"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:3821
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "svart"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:3822
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "brun"
@@ -31558,5 +31777,5 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:3823 build/trans_style.java:2635
+#: build/trans_presets.java:2518 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
@@ -31568,40 +31787,40 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:3824
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "rød"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:3825
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "blå"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:3826
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "grå"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:3827
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "hvit"
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:3829
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Antall seter"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:2522
 msgid "Edit Shelter"
 msgstr "Rediger ly"
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:2527
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:2528
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -31610,30 +31829,30 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:3841 build/trans_presets.java:5833
+#: build/trans_presets.java:2530 build/trans_presets.java:3793
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:3842
+#: build/trans_presets.java:2530
 msgid "low"
 msgstr "lav"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:3843
+#: build/trans_presets.java:2530
 msgid "half"
 msgstr "halv"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:3844
+#: build/trans_presets.java:2530
 msgid "full"
 msgstr "full"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:2532
 msgid "Hide"
 msgstr "Skjul"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:3856
+#: build/trans_presets.java:2533
 msgid "Lock"
 msgstr "Lås"
@@ -31641,5 +31860,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:3863
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -31648,10 +31867,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:3866
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:3870
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -31660,5 +31879,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Rediger hydrant"
@@ -31667,20 +31886,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:3878 build/trans_presets.java:5190
+#: build/trans_presets.java:2551 build/trans_presets.java:3314
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:2552
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:2553
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:3881
+#: build/trans_presets.java:2554
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -31694,6 +31913,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:3885 build/trans_presets.java:3931
-#: build/trans_presets.java:3977 build/trans_presets.java:4023
+#: build/trans_presets.java:2558 build/trans_presets.java:2567
+#: build/trans_presets.java:2576 build/trans_presets.java:2585
 msgid "select sport:"
 msgstr "velg sport:"
@@ -32039,6 +32258,6 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:3887 build/trans_presets.java:3933
-#: build/trans_presets.java:3979 build/trans_presets.java:4025
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 #: build/trans_style.java:3071 build/trans_style.java:3077
 #: build/trans_style.java:3083 build/trans_style.java:3089
@@ -32076,6 +32295,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3888 build/trans_presets.java:3934
-#: build/trans_presets.java:3980 build/trans_presets.java:4026
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "multi"
 msgstr "flerbruk"
@@ -32085,6 +32304,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3889 build/trans_presets.java:3935
-#: build/trans_presets.java:3981 build/trans_presets.java:4027
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "archery"
 msgstr "bueskyting"
@@ -32094,6 +32313,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3890 build/trans_presets.java:3936
-#: build/trans_presets.java:3982 build/trans_presets.java:4028
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "athletics"
 msgstr "turn"
@@ -32103,6 +32322,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3891 build/trans_presets.java:3937
-#: build/trans_presets.java:3983 build/trans_presets.java:4029
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "american_football"
 msgstr ""
@@ -32112,6 +32331,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3892 build/trans_presets.java:3938
-#: build/trans_presets.java:3984 build/trans_presets.java:4030
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "australian_football"
 msgstr "australsk fotball"
@@ -32121,6 +32340,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3893 build/trans_presets.java:3939
-#: build/trans_presets.java:3985 build/trans_presets.java:4031
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "baseball"
 msgstr "baseball"
@@ -32130,6 +32349,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3894 build/trans_presets.java:3940
-#: build/trans_presets.java:3986 build/trans_presets.java:4032
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "basketball"
 msgstr "basketball"
@@ -32139,6 +32358,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3895 build/trans_presets.java:3941
-#: build/trans_presets.java:3987 build/trans_presets.java:4033
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "boules"
 msgstr "boules"
@@ -32148,6 +32367,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3896 build/trans_presets.java:3942
-#: build/trans_presets.java:3988 build/trans_presets.java:4034
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "bowls"
 msgstr "bowls"
@@ -32157,6 +32376,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3897 build/trans_presets.java:3943
-#: build/trans_presets.java:3989 build/trans_presets.java:4035
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "canadian_football"
 msgstr ""
@@ -32166,6 +32385,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3898 build/trans_presets.java:3944
-#: build/trans_presets.java:3990 build/trans_presets.java:4036
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "canoe"
 msgstr "kano"
@@ -32175,6 +32394,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3899 build/trans_presets.java:3945
-#: build/trans_presets.java:3991 build/trans_presets.java:4037
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "climbing"
 msgstr "klatring"
@@ -32184,6 +32403,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3900 build/trans_presets.java:3946
-#: build/trans_presets.java:3992 build/trans_presets.java:4038
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "cricket"
 msgstr "cricket"
@@ -32193,6 +32412,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3901 build/trans_presets.java:3947
-#: build/trans_presets.java:3993 build/trans_presets.java:4039
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "cricket_nets"
 msgstr "cricketnett"
@@ -32202,6 +32421,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3902 build/trans_presets.java:3948
-#: build/trans_presets.java:3994 build/trans_presets.java:4040
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "croquet"
 msgstr "krocket"
@@ -32211,6 +32430,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3903 build/trans_presets.java:3949
-#: build/trans_presets.java:3995 build/trans_presets.java:4041
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "cycling"
 msgstr "sykling"
@@ -32220,6 +32439,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3904 build/trans_presets.java:3950
-#: build/trans_presets.java:3996 build/trans_presets.java:4042
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "dog_racing"
 msgstr "hundeløp"
@@ -32229,6 +32448,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3905 build/trans_presets.java:3951
-#: build/trans_presets.java:3997 build/trans_presets.java:4043
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "equestrian"
 msgstr "ridning"
@@ -32238,6 +32457,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3906 build/trans_presets.java:3952
-#: build/trans_presets.java:3998 build/trans_presets.java:4044
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "gaelic_football"
 msgstr ""
@@ -32247,6 +32466,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3907 build/trans_presets.java:3953
-#: build/trans_presets.java:3999 build/trans_presets.java:4045
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "golf"
 msgstr "golf"
@@ -32256,6 +32475,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3908 build/trans_presets.java:3954
-#: build/trans_presets.java:4000 build/trans_presets.java:4046
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "gymnastics"
 msgstr "gymnastikk"
@@ -32265,6 +32484,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3909 build/trans_presets.java:3955
-#: build/trans_presets.java:4001 build/trans_presets.java:4047
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "hockey"
 msgstr "ishockey"
@@ -32274,6 +32493,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3910 build/trans_presets.java:3956
-#: build/trans_presets.java:4002 build/trans_presets.java:4048
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "horse_racing"
 msgstr "hesteløp"
@@ -32283,6 +32502,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3911 build/trans_presets.java:3957
-#: build/trans_presets.java:4003 build/trans_presets.java:4049
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "motor"
 msgstr "motorsport"
@@ -32292,6 +32511,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3912 build/trans_presets.java:3958
-#: build/trans_presets.java:4004 build/trans_presets.java:4050
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "pelota"
 msgstr "pelota"
@@ -32301,6 +32520,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3913 build/trans_presets.java:3959
-#: build/trans_presets.java:4005 build/trans_presets.java:4051
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "racquet"
 msgstr "racquet"
@@ -32310,6 +32529,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3914 build/trans_presets.java:3960
-#: build/trans_presets.java:4006 build/trans_presets.java:4052
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "rugby_league"
 msgstr ""
@@ -32319,6 +32538,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3915 build/trans_presets.java:3961
-#: build/trans_presets.java:4007 build/trans_presets.java:4053
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "rugby_union"
 msgstr ""
@@ -32328,6 +32547,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3916 build/trans_presets.java:3962
-#: build/trans_presets.java:4008 build/trans_presets.java:4054
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "shooting"
 msgstr "skyting"
@@ -32337,6 +32556,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3917 build/trans_presets.java:3963
-#: build/trans_presets.java:4009 build/trans_presets.java:4055
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "skateboard"
 msgstr "skateboard"
@@ -32346,6 +32565,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3918 build/trans_presets.java:3964
-#: build/trans_presets.java:4010 build/trans_presets.java:4056
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "skating"
 msgstr "skøyter"
@@ -32355,6 +32574,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3919 build/trans_presets.java:3965
-#: build/trans_presets.java:4011 build/trans_presets.java:4057
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "skiing"
 msgstr "ski"
@@ -32364,6 +32583,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3920 build/trans_presets.java:3966
-#: build/trans_presets.java:4012 build/trans_presets.java:4058
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "soccer"
 msgstr "fotball"
@@ -32373,6 +32592,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3921 build/trans_presets.java:3967
-#: build/trans_presets.java:4013 build/trans_presets.java:4059
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "swimming"
 msgstr "svømming"
@@ -32382,6 +32601,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3922 build/trans_presets.java:3968
-#: build/trans_presets.java:4014 build/trans_presets.java:4060
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "table_tennis"
 msgstr "bordtennis"
@@ -32391,71 +32610,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:3923 build/trans_presets.java:3969
-#: build/trans_presets.java:4015 build/trans_presets.java:4061
+#: build/trans_presets.java:2560 build/trans_presets.java:2569
+#: build/trans_presets.java:2578 build/trans_presets.java:2587
 msgid "tennis"
 msgstr "tennis"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:3926
+#: build/trans_presets.java:2562
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:3927
+#: build/trans_presets.java:2563
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:2571
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:3973
+#: build/trans_presets.java:2572
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:2580
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:4019
+#: build/trans_presets.java:2581
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:4064
+#: build/trans_presets.java:2589
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:4065
+#: build/trans_presets.java:2590
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:4074
+#: build/trans_presets.java:2595
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:4075
+#: build/trans_presets.java:2596
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
 #. group "Sport"
-#: build/trans_presets.java:4085
+#: build/trans_presets.java:2602
 msgid "Sport"
 msgstr "Sport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:2603
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:4087
+#: build/trans_presets.java:2604
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -32503,25 +32722,25 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: 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
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2643 build/trans_presets.java:2649
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2694 build/trans_presets.java:2701
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2727
+#: build/trans_presets.java:2733 build/trans_presets.java:2739
+#: build/trans_presets.java:2745 build/trans_presets.java:2751
+#: build/trans_presets.java:2757 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
+#: build/trans_presets.java:2799 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2823 build/trans_presets.java:2829
+#: build/trans_presets.java:2835 build/trans_presets.java:2841
+#: build/trans_presets.java:2849 build/trans_presets.java:2855
+#: build/trans_presets.java:2861 build/trans_presets.java:2867
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
 msgid "type"
 msgstr "type"
@@ -32571,26 +32790,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: 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
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2643 build/trans_presets.java:2649
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2694 build/trans_presets.java:2701
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2727
+#: build/trans_presets.java:2733 build/trans_presets.java:2739
+#: build/trans_presets.java:2745 build/trans_presets.java:2751
+#: build/trans_presets.java:2757 build/trans_presets.java:2766
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
+#: build/trans_presets.java:2799 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2823 build/trans_presets.java:2829
+#: build/trans_presets.java:2835 build/trans_presets.java:2841
+#: build/trans_presets.java:2849 build/trans_presets.java:2855
+#: build/trans_presets.java:2861 build/trans_presets.java:2867
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
 msgid "pitch"
 msgstr "bane"
@@ -32640,26 +32859,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: 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
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2643 build/trans_presets.java:2649
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2694 build/trans_presets.java:2701
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2727
+#: build/trans_presets.java:2733 build/trans_presets.java:2739
+#: build/trans_presets.java:2745 build/trans_presets.java:2751
+#: build/trans_presets.java:2757 build/trans_presets.java:2766
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
+#: build/trans_presets.java:2799 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2823 build/trans_presets.java:2829
+#: build/trans_presets.java:2835 build/trans_presets.java:2841
+#: build/trans_presets.java:2849 build/trans_presets.java:2855
+#: build/trans_presets.java:2861 build/trans_presets.java:2867
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
 msgid "sports_centre"
 msgstr "sportssenter"
@@ -32704,24 +32923,24 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: 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
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2643 build/trans_presets.java:2649
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2694 build/trans_presets.java:2701
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2727
+#: build/trans_presets.java:2733 build/trans_presets.java:2739
+#: build/trans_presets.java:2745 build/trans_presets.java:2751
+#: build/trans_presets.java:2757 build/trans_presets.java:2766
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
+#: build/trans_presets.java:2799 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2823 build/trans_presets.java:2829
+#: build/trans_presets.java:2835 build/trans_presets.java:2841
+#: build/trans_presets.java:2849
 msgid "stadium"
 msgstr "stadion"
@@ -32769,150 +32988,150 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: 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
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2643 build/trans_presets.java:2649
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2694 build/trans_presets.java:2701
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2727
+#: build/trans_presets.java:2733 build/trans_presets.java:2739
+#: build/trans_presets.java:2745 build/trans_presets.java:2751
+#: build/trans_presets.java:2757 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
+#: build/trans_presets.java:2799 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2823 build/trans_presets.java:2829
+#: build/trans_presets.java:2835 build/trans_presets.java:2841
+#: build/trans_presets.java:2849 build/trans_presets.java:2855
+#: build/trans_presets.java:2861 build/trans_presets.java:2867
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
 msgid "track"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:2609
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:2610
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:4108
+#: build/trans_presets.java:2615
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:2616
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:2621
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:4120
+#: build/trans_presets.java:2622
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:4130
+#: build/trans_presets.java:2627
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:4131
+#: build/trans_presets.java:2628
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:2633
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:2634
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:4153
+#: build/trans_presets.java:2640
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:4163
+#: build/trans_presets.java:2645
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:2646
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:4174
+#: build/trans_presets.java:2651
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:4175
+#: build/trans_presets.java:2652
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:4185
+#: build/trans_presets.java:2657
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:4186
+#: build/trans_presets.java:2658
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:4196
+#: build/trans_presets.java:2663
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:2664
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:4207
+#: build/trans_presets.java:2669
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:4208
+#: build/trans_presets.java:2670
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:4218
+#: build/trans_presets.java:2675
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:4219
+#: build/trans_presets.java:2676
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:2681
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:4230
+#: build/trans_presets.java:2682
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -32920,60 +33139,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:2689
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:4245
+#: build/trans_presets.java:2692
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:2692
 msgid "downhill"
 msgstr "slalom"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:2692
 msgid "nordic"
 msgstr "langrenn"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:2692
 msgid "snow_park"
 msgstr "snøpark"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:4250
+#: build/trans_presets.java:2693
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:4251
+#: build/trans_presets.java:2693
 msgid "novice"
 msgstr "begynner"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:4252
+#: build/trans_presets.java:2693
 msgid "easy"
 msgstr "enkel"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:4254
+#: build/trans_presets.java:2693
 msgid "advanced"
 msgstr "vanskelig"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:4255
+#: build/trans_presets.java:2693
 msgid "expert"
 msgstr "ekspert"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:2693
 msgid "freeride"
 msgstr "fristil"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:4265
+#: build/trans_presets.java:2696
 msgid "Shooting"
 msgstr "Skyting"
@@ -32981,105 +33200,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:4267
+#: build/trans_presets.java:2698
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:4278
+#: build/trans_presets.java:2704
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:4279
+#: build/trans_presets.java:2705
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:4280
+#: build/trans_presets.java:2706
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:4290
+#: build/trans_presets.java:2711
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:4291
+#: build/trans_presets.java:2712
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:4301
+#: build/trans_presets.java:2717
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:2718
 msgid "Edit American Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:4312
+#: build/trans_presets.java:2723
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:4313
+#: build/trans_presets.java:2724
 msgid "Edit Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:4323
+#: build/trans_presets.java:2729
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:4324
+#: build/trans_presets.java:2730
 msgid "Edit Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:4334
+#: build/trans_presets.java:2735
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:4335
+#: build/trans_presets.java:2736
 msgid "Edit Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:4345
+#: build/trans_presets.java:2741
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:4346
+#: build/trans_presets.java:2742
 msgid "Edit Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:4356
+#: build/trans_presets.java:2747
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:4357
+#: build/trans_presets.java:2748
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:4367
+#: build/trans_presets.java:2753
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:4368
+#: build/trans_presets.java:2754
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:4378
+#: build/trans_presets.java:2759
 msgid "Volleyball"
 msgstr ""
@@ -33087,10 +33306,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:4380
+#: build/trans_presets.java:2761
 msgid "Edit Volleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:4391
+#: build/trans_presets.java:2768
 msgid "Beachvolleyball"
 msgstr ""
@@ -33098,120 +33317,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:4393
+#: build/trans_presets.java:2770
 msgid "Edit Beachvolleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:4404
+#: build/trans_presets.java:2777
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:4405
+#: build/trans_presets.java:2778
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:4409
+#: build/trans_presets.java:2781
 msgid "golf_course"
 msgstr "golfbane"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:4416
+#: build/trans_presets.java:2783
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:4417
+#: build/trans_presets.java:2784
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:4427
+#: build/trans_presets.java:2789
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:4428
+#: build/trans_presets.java:2790
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:4438
+#: build/trans_presets.java:2795
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:4439
+#: build/trans_presets.java:2796
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:4449
+#: build/trans_presets.java:2801
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:4450
+#: build/trans_presets.java:2802
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:4460
+#: build/trans_presets.java:2807
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:4461
+#: build/trans_presets.java:2808
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:4471
+#: build/trans_presets.java:2813
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:4472
+#: build/trans_presets.java:2814
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:4482
+#: build/trans_presets.java:2819
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:4483
+#: build/trans_presets.java:2820
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:4493
+#: build/trans_presets.java:2825
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:4494
+#: build/trans_presets.java:2826
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:4504
+#: build/trans_presets.java:2831
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:4505
+#: build/trans_presets.java:2832
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:4515
+#: build/trans_presets.java:2837
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:4516
+#: build/trans_presets.java:2838
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
@@ -33219,40 +33438,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:4527 build/trans_presets.java:4528
+#: build/trans_presets.java:2844 build/trans_presets.java:2845
 msgid "Motorsport"
 msgstr ""
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:4529
+#: build/trans_presets.java:2846
 msgid "Edit Motorsport"
 msgstr ""
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:4539
+#: build/trans_presets.java:2851
 msgid "Karting"
 msgstr ""
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:4540
+#: build/trans_presets.java:2852
 msgid "Edit Karting"
 msgstr ""
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:4549
+#: build/trans_presets.java:2857
 msgid "Motocross"
 msgstr ""
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:4550
+#: build/trans_presets.java:2858
 msgid "Edit Motocross"
 msgstr ""
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:4559
+#: build/trans_presets.java:2863
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:4560
+#: build/trans_presets.java:2864
 msgid "Edit Safety Training"
 msgstr ""
@@ -33260,20 +33479,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:4570
+#: build/trans_presets.java:2870
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:4571
+#: build/trans_presets.java:2871
 msgid "Edit Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:4580
+#: build/trans_presets.java:2876
 msgid "RC Car"
 msgstr ""
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:4581
+#: build/trans_presets.java:2877
 msgid "Edit RC Car"
 msgstr ""
@@ -33281,10 +33500,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:4592 build/trans_presets.java:4593
+#: build/trans_presets.java:2884 build/trans_presets.java:2885
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:4594
+#: build/trans_presets.java:2886
 msgid "Building"
 msgstr "Bygning"
@@ -33292,25 +33511,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:4597
+#: build/trans_presets.java:2889
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:4598
+#: build/trans_presets.java:2890
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:4601
+#: build/trans_presets.java:2893
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:4602
+#: build/trans_presets.java:2893
 msgid "communication"
 msgstr ""
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:4603
+#: build/trans_presets.java:2893
 msgid "observation"
 msgstr ""
@@ -33319,5 +33538,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:4606 build/trans_presets.java:4627
+#: build/trans_presets.java:2895 build/trans_presets.java:2916
 msgid "Height (meters)"
 msgstr "Høyde (meter)"
@@ -33325,5 +33544,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:4610
+#: build/trans_presets.java:2899
 msgid "Flagpole"
 msgstr ""
@@ -33333,15 +33552,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:4615
+#: build/trans_presets.java:2904
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:4616
+#: build/trans_presets.java:2905
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:4620
+#: build/trans_presets.java:2909
 msgid "Chimney"
 msgstr ""
@@ -33349,10 +33568,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:4622
+#: build/trans_presets.java:2911
 msgid "Edit Chimney"
 msgstr ""
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:4629
+#: build/trans_presets.java:2918
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -33360,20 +33579,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:4631
+#: build/trans_presets.java:2920
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:4635
+#: build/trans_presets.java:2924
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:4636
+#: build/trans_presets.java:2925
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:4640
+#: build/trans_presets.java:2929
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -33382,5 +33601,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:4643
+#: build/trans_presets.java:2932
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
@@ -33388,30 +33607,30 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:4648 build/trans_presets.java:4851
+#: build/trans_presets.java:2935 build/trans_presets.java:3061
 msgid "gas"
 msgstr "gass"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:4649
+#: build/trans_presets.java:2935
 msgid "heat"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:4650
+#: build/trans_presets.java:2935
 msgid "oil"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:4651
+#: build/trans_presets.java:2935
 msgid "sewage"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:4653
+#: build/trans_presets.java:2936
 msgid "Location"
 msgstr "Område"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:4654
+#: build/trans_presets.java:2936
 msgctxt "pipeline"
 msgid "underground"
@@ -33419,5 +33638,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:4655
+#: build/trans_presets.java:2936
 msgctxt "pipeline"
 msgid "underwater"
@@ -33425,5 +33644,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:4656
+#: build/trans_presets.java:2936
 msgctxt "pipeline"
 msgid "overground"
@@ -33431,5 +33650,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:4659
+#: build/trans_presets.java:2938
 msgid "Crane"
 msgstr "Kran"
@@ -33437,10 +33656,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:4661
+#: build/trans_presets.java:2940
 msgid "Edit Crane"
 msgstr "Rediger kran"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:4665
+#: build/trans_presets.java:2944
 msgid "Mineshaft"
 msgstr ""
@@ -33449,25 +33668,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:4668
+#: build/trans_presets.java:2947
 msgid "Edit Mineshaft"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:4671
+#: build/trans_presets.java:2950
 msgid "Function"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:4672
+#: build/trans_presets.java:2950
 msgid "winding"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:4673
+#: build/trans_presets.java:2950
 msgid "air"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:4675
+#: build/trans_presets.java:2951
 msgid "Depth in meters"
 msgstr ""
@@ -33475,5 +33694,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:4677 build/trans_presets.java:4709
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "Resource"
 msgstr ""
@@ -33481,5 +33700,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:4678 build/trans_presets.java:4710
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "aggregate"
 msgstr ""
@@ -33487,5 +33706,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:4679 build/trans_presets.java:4711
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "bauxite"
 msgstr ""
@@ -33494,6 +33713,6 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:4680 build/trans_presets.java:4712
-#: build/trans_presets.java:4849
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
+#: build/trans_presets.java:3061
 msgid "coal"
 msgstr "kull"
@@ -33501,5 +33720,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:4681 build/trans_presets.java:4713
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "copper"
 msgstr ""
@@ -33507,5 +33726,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:4682 build/trans_presets.java:4714
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "dimension_stone"
 msgstr ""
@@ -33513,5 +33732,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:4683 build/trans_presets.java:4715
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "gold"
 msgstr ""
@@ -33519,5 +33738,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:4684 build/trans_presets.java:4716
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "ilmenite"
 msgstr ""
@@ -33525,5 +33744,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:4685 build/trans_presets.java:4717
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "iron_ore"
 msgstr ""
@@ -33531,5 +33750,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:4686 build/trans_presets.java:4718
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "lead"
 msgstr ""
@@ -33537,5 +33756,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:4687 build/trans_presets.java:4719
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "limestone"
 msgstr ""
@@ -33543,5 +33762,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:4688 build/trans_presets.java:4720
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "nickel"
 msgstr ""
@@ -33549,5 +33768,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:4689 build/trans_presets.java:4721
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "rutile"
 msgstr ""
@@ -33555,5 +33774,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:4690 build/trans_presets.java:4722
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "salt"
 msgstr ""
@@ -33561,5 +33780,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:4691 build/trans_presets.java:4723
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "silver"
 msgstr ""
@@ -33567,5 +33786,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:4692 build/trans_presets.java:4724
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "tin"
 msgstr ""
@@ -33573,5 +33792,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:4693 build/trans_presets.java:4725
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "zinc"
 msgstr ""
@@ -33579,10 +33798,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:4694 build/trans_presets.java:4726
+#: build/trans_presets.java:2953 build/trans_presets.java:2964
 msgid "zircon"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:4696
+#: build/trans_presets.java:2954
 msgid "Visible Headframe"
 msgstr ""
@@ -33590,10 +33809,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:4700 build/trans_presets.java:4728
+#: build/trans_presets.java:2955 build/trans_presets.java:2965
 msgid "Disused"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:4702
+#: build/trans_presets.java:2957
 msgid "Adit"
 msgstr ""
@@ -33601,10 +33820,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:4704
+#: build/trans_presets.java:2959
 msgid "Edit Adit"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:4707
+#: build/trans_presets.java:2962
 msgid "Length in meters"
 msgstr ""
@@ -33612,15 +33831,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:4731
+#: build/trans_presets.java:2968
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:4732
+#: build/trans_presets.java:2969
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:4736
+#: build/trans_presets.java:2973
 msgid "Water Works"
 msgstr ""
@@ -33628,10 +33847,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:4738
+#: build/trans_presets.java:2975
 msgid "Edit Water Works"
 msgstr ""
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:4744
+#: build/trans_presets.java:2981
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -33641,10 +33860,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:4748
+#: build/trans_presets.java:2985
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:4752
+#: build/trans_presets.java:2989
 msgid "Watermill"
 msgstr ""
@@ -33652,10 +33871,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:4754
+#: build/trans_presets.java:2991
 msgid "Edit Watermill"
 msgstr ""
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:4759
+#: build/trans_presets.java:2996
 msgid "Fountain"
 msgstr "Fontene"
@@ -33664,10 +33883,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:4762
+#: build/trans_presets.java:2999
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:4766
+#: build/trans_presets.java:3003
 msgid "Water Well"
 msgstr ""
@@ -33675,5 +33894,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:4768
+#: build/trans_presets.java:3005
 msgid "Edit Water Well"
 msgstr ""
@@ -33681,5 +33900,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:4773
+#: build/trans_presets.java:3010
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -33687,5 +33906,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:4775
+#: build/trans_presets.java:3012
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
@@ -33693,10 +33912,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:4781
+#: build/trans_presets.java:3018
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:4785
+#: build/trans_presets.java:3022
 msgid "Street Lamp"
 msgstr ""
@@ -33704,5 +33923,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:4787
+#: build/trans_presets.java:3024
 msgid "Edit Street Lamp"
 msgstr ""
@@ -33711,15 +33930,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:4790
+#: build/trans_presets.java:3027
 msgid "Operation times"
 msgstr ""
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:4791
+#: build/trans_presets.java:3027
 msgid "Mo-Fr 22:00-05:00"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:4794
+#: build/trans_presets.java:3029
 msgid "Measurement Station"
 msgstr ""
@@ -33727,55 +33946,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:4796
+#: build/trans_presets.java:3031
 msgid "Edit Measurement Station"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:4801
+#: build/trans_presets.java:3036
 msgid "Measurement"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:4802
+#: build/trans_presets.java:3036
 msgid "particulate_matter"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:4803
+#: build/trans_presets.java:3036
 msgid "seismic"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:4804
+#: build/trans_presets.java:3036
 msgid "water_level"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:4805
+#: build/trans_presets.java:3036
 msgid "weather"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:4807
+#: build/trans_presets.java:3037
 msgid "Recording"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:4808
+#: build/trans_presets.java:3037
 msgid "manually"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:4809
+#: build/trans_presets.java:3037
 msgid "automated"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:4810
+#: build/trans_presets.java:3037
 msgid "remote"
 msgstr ""
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:4819
+#: build/trans_presets.java:3040
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -33783,10 +34002,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:4821
+#: build/trans_presets.java:3042
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:4825
+#: build/trans_presets.java:3046
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -33794,30 +34013,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:4827
+#: build/trans_presets.java:3048
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:4831
+#: build/trans_presets.java:3051
 msgid "indoor"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:4832
+#: build/trans_presets.java:3051
 msgid "outdoor"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:4833
+#: build/trans_presets.java:3051
 msgid "public"
 msgstr ""
 
 #. group "Power"
-#: build/trans_presets.java:4837
+#: build/trans_presets.java:3054
 msgid "Power"
 msgstr ""
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:4838
+#: build/trans_presets.java:3055
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -33827,35 +34046,35 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:4842
+#: build/trans_presets.java:3059
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:4845
+#: build/trans_presets.java:3061
 msgid "wind"
 msgstr "vind"
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:4846
+#: build/trans_presets.java:3061
 msgid "hydro"
 msgstr "vann"
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:4847
+#: build/trans_presets.java:3061
 msgid "fossil"
 msgstr "fossil"
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:4848
+#: build/trans_presets.java:3061
 msgid "nuclear"
 msgstr "atom"
 
 #. item "Power/Power Generator" combo "Type" display value
-#: build/trans_presets.java:4850
+#: build/trans_presets.java:3061
 msgid "photovoltaic"
 msgstr "solcelle"
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:4855
+#: build/trans_presets.java:3064
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -33864,10 +34083,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:4858
+#: build/trans_presets.java:3067
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:4864
+#: build/trans_presets.java:3073
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -33876,5 +34095,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:4867
+#: build/trans_presets.java:3076
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -33882,10 +34101,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:4870 build/trans_presets.java:4906
+#: build/trans_presets.java:3079 build/trans_presets.java:3112
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:4872
+#: build/trans_presets.java:3081
 msgid "Cable Distribution Cabinet"
 msgstr ""
@@ -33894,5 +34113,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:4875
+#: build/trans_presets.java:3084
 msgid "Edit Cable Distribution Cabinet"
 msgstr ""
@@ -33900,5 +34119,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:4881
+#: build/trans_presets.java:3090
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -33909,5 +34128,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:4886
+#: build/trans_presets.java:3095
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
@@ -33915,10 +34134,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:4888
+#: build/trans_presets.java:3097
 msgid "Tower reference"
 msgstr ""
 
 #. item "Power/Pole"
-#: build/trans_presets.java:4890
+#: build/trans_presets.java:3099
 msgid "Pole"
 msgstr ""
@@ -33927,5 +34146,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:4893
+#: build/trans_presets.java:3102
 msgid "Edit Power Pole"
 msgstr ""
@@ -33933,10 +34152,10 @@
 #. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:4895
+#: build/trans_presets.java:3104
 msgid "Pole reference"
 msgstr ""
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:4897
+#: build/trans_presets.java:3106
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -33945,15 +34164,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:4900
+#: build/trans_presets.java:3109
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:4901
+#: build/trans_presets.java:3110
 msgid "Line type"
 msgstr ""
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:4902
+#: build/trans_presets.java:3110
 msgctxt "Power Line"
 msgid "line"
@@ -33961,5 +34180,5 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:4903
+#: build/trans_presets.java:3110
 msgctxt "Power Line"
 msgid "minor_line"
@@ -33967,40 +34186,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:4910
+#: build/trans_presets.java:3115
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:4911
+#: build/trans_presets.java:3116
 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:4912
+#: build/trans_presets.java:3116
 msgid "single"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:4913
+#: build/trans_presets.java:3116
 msgid "double"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:4914
+#: build/trans_presets.java:3116
 msgid "triple"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:4915
+#: build/trans_presets.java:3116
 msgid "quad"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:4919
+#: build/trans_presets.java:3119
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:4920
+#: build/trans_presets.java:3120
 msgid "Castle"
 msgstr "Slott"
@@ -34009,20 +34228,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:4923
+#: build/trans_presets.java:3123
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:4928
+#: build/trans_presets.java:3128
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:4929
+#: build/trans_presets.java:3129
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:4938
+#: build/trans_presets.java:3134
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -34031,10 +34250,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:4941
+#: build/trans_presets.java:3137
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:4950
+#: build/trans_presets.java:3142
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -34042,10 +34261,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:4952
+#: build/trans_presets.java:3144
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:4956
+#: build/trans_presets.java:3148
 msgid "Palaeontological Site"
 msgstr "Paleontologisk sted"
@@ -34053,5 +34272,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:4958
+#: build/trans_presets.java:3150
 msgid "Edit Palaeontological Site"
 msgstr "Rediger paleontologisk sted"
@@ -34059,15 +34278,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:4963
+#: build/trans_presets.java:3155
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:4964
+#: build/trans_presets.java:3156
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:4968
+#: build/trans_presets.java:3160
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -34075,60 +34294,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:4970
+#: build/trans_presets.java:3162
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:4974
+#: build/trans_presets.java:3166
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:4975
+#: build/trans_presets.java:3167
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:4979
+#: build/trans_presets.java:3171
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:4980
+#: build/trans_presets.java:3172
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:4984
+#: build/trans_presets.java:3176
 msgid "Boundary Stone"
 msgstr "Grensestein"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:4985
+#: build/trans_presets.java:3177
 msgid "Edit Boundary Stone"
 msgstr "Rediger grensestein"
 
 #. group "Shops"
-#: build/trans_presets.java:4991
+#: build/trans_presets.java:3183
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:4992
+#: build/trans_presets.java:3184
 msgid "Food"
 msgstr ""
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:4993
+#: build/trans_presets.java:3185
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:4994
+#: build/trans_presets.java:3186
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:5003
+#: build/trans_presets.java:3191
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -34136,10 +34355,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:5005
+#: build/trans_presets.java:3193
 msgid "Edit Convenience Store"
 msgstr "Rediger minimarked"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:5014
+#: build/trans_presets.java:3198
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -34147,5 +34366,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:5016
+#: build/trans_presets.java:3200
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
@@ -34153,5 +34372,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:5026
+#: build/trans_presets.java:3206
 msgid "Baker"
 msgstr "Baker"
@@ -34159,10 +34378,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:5028
+#: build/trans_presets.java:3208
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:5037
+#: build/trans_presets.java:3213
 msgid "Butcher"
 msgstr "Slakter"
@@ -34170,10 +34389,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:5039
+#: build/trans_presets.java:3215
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:5048
+#: build/trans_presets.java:3220
 msgid "Seafood"
 msgstr ""
@@ -34181,10 +34400,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:5050
+#: build/trans_presets.java:3222
 msgid "Edit Seafood"
 msgstr ""
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:5061
+#: build/trans_presets.java:3229
 msgid "Deli (Fine Food)"
 msgstr ""
@@ -34192,10 +34411,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:5063
+#: build/trans_presets.java:3231
 msgid "Edit Deli (Fine Food)"
 msgstr ""
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:5074
+#: build/trans_presets.java:3238
 msgid "Confectionery"
 msgstr ""
@@ -34203,5 +34422,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:5076
+#: build/trans_presets.java:3240
 msgid "Edit Confectionery"
 msgstr ""
@@ -34209,5 +34428,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:5086
+#: build/trans_presets.java:3246
 msgid "Marketplace"
 msgstr ""
@@ -34215,10 +34434,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:5088
+#: build/trans_presets.java:3248
 msgid "Edit Marketplace"
 msgstr ""
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:5099
+#: build/trans_presets.java:3255
 msgid "Greengrocer"
 msgstr ""
@@ -34226,15 +34445,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:5101
+#: build/trans_presets.java:3257
 msgid "Edit Greengrocer"
 msgstr ""
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:5112
+#: build/trans_presets.java:3264
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:5113
+#: build/trans_presets.java:3265
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
@@ -34242,5 +34461,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:5123
+#: build/trans_presets.java:3271
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -34248,25 +34467,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:5125
+#: build/trans_presets.java:3273
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:5134
+#: build/trans_presets.java:3278
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:5135
+#: build/trans_presets.java:3279
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:5147
+#: build/trans_presets.java:3287
 msgid "Edit Clothes Shop"
 msgstr ""
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:5156
+#: build/trans_presets.java:3292
 msgid "Boutique"
 msgstr ""
@@ -34274,20 +34493,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:5158
+#: build/trans_presets.java:3294
 msgid "Edit Boutique"
 msgstr ""
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:5169
+#: build/trans_presets.java:3301
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:5170
+#: build/trans_presets.java:3302
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:5179
+#: build/trans_presets.java:3307
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -34295,10 +34514,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:5181
+#: build/trans_presets.java:3309
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:5191
+#: build/trans_presets.java:3315
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
@@ -34306,5 +34525,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:5201
+#: build/trans_presets.java:3321
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -34312,10 +34531,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:5203
+#: build/trans_presets.java:3323
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:5212
+#: build/trans_presets.java:3328
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -34323,20 +34542,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:5214
+#: build/trans_presets.java:3330
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:5223
+#: build/trans_presets.java:3335
 msgid "Tailor"
 msgstr ""
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:5224
+#: build/trans_presets.java:3336
 msgid "Edit Tailor"
 msgstr ""
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:5233
+#: build/trans_presets.java:3341
 msgid "Fabric"
 msgstr ""
@@ -34344,35 +34563,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:5235
+#: build/trans_presets.java:3343
 msgid "Edit Fabric"
 msgstr ""
 
 #. group "Electronic"
-#: build/trans_presets.java:5247
+#: build/trans_presets.java:3351
 msgid "Electronic"
 msgstr ""
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:5248
+#: build/trans_presets.java:3352
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:5249
+#: build/trans_presets.java:3353
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:5258
+#: build/trans_presets.java:3358
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:5259
+#: build/trans_presets.java:3359
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:5268
+#: build/trans_presets.java:3364
 msgid "Mobile Phone"
 msgstr ""
@@ -34380,10 +34599,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:5270
+#: build/trans_presets.java:3366
 msgid "Edit Mobile Phone"
 msgstr ""
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:5281
+#: build/trans_presets.java:3373
 msgid "Vacuum Cleaner"
 msgstr ""
@@ -34391,35 +34610,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:5283
+#: build/trans_presets.java:3375
 msgid "Edit Vacuum Cleaner"
 msgstr ""
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:5294
+#: build/trans_presets.java:3382
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:5295
+#: build/trans_presets.java:3383
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:5304
+#: build/trans_presets.java:3388
 msgid "Video"
 msgstr "Video"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:5305
+#: build/trans_presets.java:3389
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
 #. group "Cash"
-#: build/trans_presets.java:5315
+#: build/trans_presets.java:3395
 msgid "Cash"
 msgstr "Valuta"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:5316
+#: build/trans_presets.java:3396
 msgid "Bank"
 msgstr "Bank"
@@ -34427,5 +34646,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:5318
+#: build/trans_presets.java:3398
 msgid "Edit Bank"
 msgstr "Rediger bank"
@@ -34433,10 +34652,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:5327 build/trans_presets.java:5340
+#: build/trans_presets.java:3403 build/trans_presets.java:3412
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:5329
+#: build/trans_presets.java:3405
 msgid "Money Exchange"
 msgstr "Vekslingssted"
@@ -34444,5 +34663,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:5331
+#: build/trans_presets.java:3407
 msgid "Edit Money Exchange"
 msgstr "Rediger vekslingssted"
@@ -34450,10 +34669,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:5342
+#: build/trans_presets.java:3414
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:5348
+#: build/trans_presets.java:3420
 msgid "Department Store"
 msgstr ""
@@ -34461,10 +34680,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:5350
+#: build/trans_presets.java:3422
 msgid "Edit Department Store"
 msgstr ""
 
 #. item "Other/Mall"
-#: build/trans_presets.java:5361
+#: build/trans_presets.java:3429
 msgid "Mall"
 msgstr ""
@@ -34472,5 +34691,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:5363
+#: build/trans_presets.java:3431
 msgid "Edit Mall"
 msgstr ""
@@ -34478,35 +34697,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:5375
+#: build/trans_presets.java:3439
 msgid "Chemist"
 msgstr "Hygiene"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:5376
+#: build/trans_presets.java:3440
 msgid "Edit Chemist"
 msgstr "Rediger hygiene"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:5385
+#: build/trans_presets.java:3445
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:5386
+#: build/trans_presets.java:3446
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:5395
+#: build/trans_presets.java:3451
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:5396
+#: build/trans_presets.java:3452
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:5405
+#: build/trans_presets.java:3457
 msgid "Jewelry"
 msgstr ""
@@ -34514,10 +34733,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:5407
+#: build/trans_presets.java:3459
 msgid "Edit Jewelry"
 msgstr ""
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:5418
+#: build/trans_presets.java:3466
 msgid "Erotic"
 msgstr ""
@@ -34525,5 +34744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:5420
+#: build/trans_presets.java:3468
 msgid "Edit Erotic"
 msgstr ""
@@ -34531,5 +34750,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:5432
+#: build/trans_presets.java:3476
 msgid "Florist"
 msgstr "Blomster"
@@ -34537,10 +34756,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:5434
+#: build/trans_presets.java:3478
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:5443
+#: build/trans_presets.java:3483
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -34548,5 +34767,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:5445
+#: build/trans_presets.java:3485
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
@@ -34554,5 +34773,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:5455
+#: build/trans_presets.java:3491
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -34560,10 +34779,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:5457
+#: build/trans_presets.java:3493
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:5466
+#: build/trans_presets.java:3498
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -34571,10 +34790,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:5468
+#: build/trans_presets.java:3500
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:5477
+#: build/trans_presets.java:3505
 msgid "Paint"
 msgstr ""
@@ -34582,5 +34801,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:5479
+#: build/trans_presets.java:3507
 msgid "Edit Paint"
 msgstr ""
@@ -34588,15 +34807,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:5491
+#: build/trans_presets.java:3515
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:5492
+#: build/trans_presets.java:3516
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:5501
+#: build/trans_presets.java:3521
 msgid "Kitchen"
 msgstr ""
@@ -34604,10 +34823,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:5503
+#: build/trans_presets.java:3523
 msgid "Edit Kitchen"
 msgstr ""
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:5514
+#: build/trans_presets.java:3530
 msgid "Curtain"
 msgstr ""
@@ -34615,10 +34834,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:5516
+#: build/trans_presets.java:3532
 msgid "Edit Curtain"
 msgstr ""
 
 #. item "Other/Frame"
-#: build/trans_presets.java:5527
+#: build/trans_presets.java:3539
 msgid "Frame"
 msgstr ""
@@ -34626,5 +34845,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:5529
+#: build/trans_presets.java:3541
 msgid "Edit Frames"
 msgstr ""
@@ -34632,15 +34851,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:5541
+#: build/trans_presets.java:3549
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:5542
+#: build/trans_presets.java:3550
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:5551
+#: build/trans_presets.java:3555
 msgid "Copyshop"
 msgstr ""
@@ -34648,15 +34867,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:5553
+#: build/trans_presets.java:3557
 msgid "Edit Copyshop"
 msgstr ""
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:5564
+#: build/trans_presets.java:3564
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:5565
+#: build/trans_presets.java:3565
 msgid "Edit Book Store"
 msgstr "Rediger bokhandel"
@@ -34664,15 +34883,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:5575
+#: build/trans_presets.java:3571
 msgid "Travel Agency"
 msgstr "Reisebyrå"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:5576
+#: build/trans_presets.java:3572
 msgid "Edit Travel Agency"
 msgstr "Rediger reisebyrå"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:5585
+#: build/trans_presets.java:3577
 msgid "Musical Instrument"
 msgstr ""
@@ -34680,20 +34899,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:5587
+#: build/trans_presets.java:3579
 msgid "Edit Musical Instruments"
 msgstr ""
 
 #. item "Other/Toys"
-#: build/trans_presets.java:5598
+#: build/trans_presets.java:3586
 msgid "Toys"
 msgstr "Leker"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:5599
+#: build/trans_presets.java:3587
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:5608
+#: build/trans_presets.java:3592
 msgid "Variety Store"
 msgstr ""
@@ -34701,10 +34920,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:5610
+#: build/trans_presets.java:3594
 msgid "Edit Variety Store"
 msgstr ""
 
 #. item "Vending machine"
-#: build/trans_presets.java:5622
+#: build/trans_presets.java:3602
 msgid "Vending machine"
 msgstr "Automat"
@@ -34712,5 +34931,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:5624
+#: build/trans_presets.java:3604
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -34718,220 +34937,220 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:5626
+#: build/trans_presets.java:3606
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5627
+#: build/trans_presets.java:3606
 msgid "public_transport_tickets"
 msgstr "billetter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5628
+#: build/trans_presets.java:3606
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5629
+#: build/trans_presets.java:3606
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5630
+#: build/trans_presets.java:3606
 msgid "food"
 msgstr "mat"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5631
+#: build/trans_presets.java:3606
 msgid "drinks"
 msgstr "drikke"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5632
+#: build/trans_presets.java:3606
 msgid "sweets"
 msgstr "godter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5633
+#: build/trans_presets.java:3606
 msgid "cigarettes"
 msgstr "sigaretter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5634
+#: build/trans_presets.java:3606
 msgid "photos"
 msgstr "fotografier"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5635
+#: build/trans_presets.java:3606
 msgid "animal_food"
 msgstr "dyremat"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5636
+#: build/trans_presets.java:3606
 msgid "news_papers"
 msgstr "aviser"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5637
+#: build/trans_presets.java:3606
 msgid "toys"
 msgstr "leker"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5638
+#: build/trans_presets.java:3606
 msgid "stamps"
 msgstr "frimerker"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5639
+#: build/trans_presets.java:3606
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5640
+#: build/trans_presets.java:3606
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5641
+#: build/trans_presets.java:3606
 msgid "vouchers"
 msgstr "kuponger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5642
+#: build/trans_presets.java:3606
 msgid "bicycle_tube"
 msgstr "sykkelslanger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5643
+#: build/trans_presets.java:3606
 msgid "condoms"
 msgstr "kondomer"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5644
+#: build/trans_presets.java:3606
 msgid "tampons"
 msgstr "tamponger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:5645
+#: build/trans_presets.java:3606
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. group "Geography"
-#: build/trans_presets.java:5658 build/trans_presets.java:5775
+#: build/trans_presets.java:3618 build/trans_presets.java:3735
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:5659
+#: build/trans_presets.java:3619
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:5660
+#: build/trans_presets.java:3620
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:5661
+#: build/trans_presets.java:3621
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:5666
+#: build/trans_presets.java:3626
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:5667
+#: build/trans_presets.java:3627
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:5672
+#: build/trans_presets.java:3632
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:5673
+#: build/trans_presets.java:3633
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:5678
+#: build/trans_presets.java:3638
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:5679
+#: build/trans_presets.java:3639
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:5684
+#: build/trans_presets.java:3644
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:5685
+#: build/trans_presets.java:3645
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. group "Places"
-#: build/trans_presets.java:5691
+#: build/trans_presets.java:3651
 msgid "Places"
 msgstr "Steder"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:5692
+#: build/trans_presets.java:3652
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:5693
+#: build/trans_presets.java:3653
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:5700
+#: build/trans_presets.java:3660
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Places/State"
-#: build/trans_presets.java:5706
+#: build/trans_presets.java:3666
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:5707
+#: build/trans_presets.java:3667
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Places/Region"
-#: build/trans_presets.java:5713
+#: build/trans_presets.java:3673
 msgid "Region"
 msgstr "Region"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:5714
+#: build/trans_presets.java:3674
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Places/County"
-#: build/trans_presets.java:5720
+#: build/trans_presets.java:3680
 msgid "County"
 msgstr "Kommune"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:5721
+#: build/trans_presets.java:3681
 msgid "Edit County"
 msgstr "Rediger kommune"
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:5729
+#: build/trans_presets.java:3689
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Places/Town"
-#: build/trans_presets.java:5735
+#: build/trans_presets.java:3695
 msgid "Town"
 msgstr "By"
@@ -34939,10 +35158,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:5737
+#: build/trans_presets.java:3697
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:5743
+#: build/trans_presets.java:3703
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -34950,25 +35169,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:5745
+#: build/trans_presets.java:3705
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Places/Village"
-#: build/trans_presets.java:5751
+#: build/trans_presets.java:3711
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:5752
+#: build/trans_presets.java:3712
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:5758
+#: build/trans_presets.java:3718
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:5759
+#: build/trans_presets.java:3719
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -34976,5 +35195,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:5766
+#: build/trans_presets.java:3726
 msgid "Locality"
 msgstr "Lokalitet"
@@ -34982,10 +35201,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:5768
+#: build/trans_presets.java:3728
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:5776
+#: build/trans_presets.java:3736
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -34993,10 +35212,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:5778
+#: build/trans_presets.java:3738
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:5784
+#: build/trans_presets.java:3744
 msgid "Glacier"
 msgstr "Isbre"
@@ -35004,10 +35223,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:5786
+#: build/trans_presets.java:3746
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:5792
+#: build/trans_presets.java:3752
 msgid "Volcano"
 msgstr "Vulkan"
@@ -35015,10 +35234,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:5794
+#: build/trans_presets.java:3754
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:5800
+#: build/trans_presets.java:3760
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -35026,5 +35245,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:5802
+#: build/trans_presets.java:3762
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
@@ -35032,5 +35251,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:5808
+#: build/trans_presets.java:3768
 msgid "Island"
 msgstr "Øy"
@@ -35038,10 +35257,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:5810
+#: build/trans_presets.java:3770
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:5816
+#: build/trans_presets.java:3776
 msgid "Islet"
 msgstr "Holme"
@@ -35049,15 +35268,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:5818
+#: build/trans_presets.java:3778
 msgid "Edit Islet"
 msgstr "Rediger holme"
 
 #. group "Nature"
-#: build/trans_presets.java:5825
+#: build/trans_presets.java:3785
 msgid "Nature"
 msgstr ""
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:5826
+#: build/trans_presets.java:3786
 msgid "Tree"
 msgstr "Tre"
@@ -35066,15 +35285,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:5829
+#: build/trans_presets.java:3789
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:5834
+#: build/trans_presets.java:3794
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:5836
+#: build/trans_presets.java:3796
 msgid "Wood"
 msgstr "Skogsområde"
@@ -35083,5 +35302,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:5839
+#: build/trans_presets.java:3799
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -35089,5 +35308,5 @@
 #. item "Nature/Wood" combo "Type" display value
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:5843 build/trans_presets.java:5856
+#: build/trans_presets.java:3802 build/trans_presets.java:3811
 msgid "coniferous"
 msgstr "barskog"
@@ -35095,5 +35314,5 @@
 #. item "Nature/Wood" combo "Type" display value
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:5844 build/trans_presets.java:5857
+#: build/trans_presets.java:3802 build/trans_presets.java:3811
 msgid "deciduous"
 msgstr "løvskog"
@@ -35101,10 +35320,10 @@
 #. item "Nature/Wood" combo "Type" display value
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:5845 build/trans_presets.java:5858
+#: build/trans_presets.java:3802 build/trans_presets.java:3811
 msgid "mixed"
 msgstr "blandingsskog"
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:5848
+#: build/trans_presets.java:3804
 msgid "Forest"
 msgstr "Skog"
@@ -35113,15 +35332,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:5851
+#: build/trans_presets.java:3807
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:5861
+#: build/trans_presets.java:3813
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:5862
+#: build/trans_presets.java:3814
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -35129,15 +35348,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:5867
+#: build/trans_presets.java:3819
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:5868
+#: build/trans_presets.java:3820
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:5872
+#: build/trans_presets.java:3824
 msgid "Fell"
 msgstr "Fjell"
@@ -35145,20 +35364,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:5874
+#: build/trans_presets.java:3826
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:5878
+#: build/trans_presets.java:3830
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:5879
+#: build/trans_presets.java:3831
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:5883
+#: build/trans_presets.java:3835
 msgid "Heath"
 msgstr "Beite"
@@ -35166,15 +35385,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:5885
+#: build/trans_presets.java:3837
 msgid "Edit Heath"
 msgstr "Rediger beite"
 
 #. group "Land use"
-#: build/trans_presets.java:5890
+#: build/trans_presets.java:3842
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:5891
+#: build/trans_presets.java:3843
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -35183,40 +35402,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:5894
+#: build/trans_presets.java:3846
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:5899
+#: build/trans_presets.java:3851
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:5900
+#: build/trans_presets.java:3852
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:5905
+#: build/trans_presets.java:3857
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:5906
+#: build/trans_presets.java:3858
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:5911
+#: build/trans_presets.java:3863
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:5912
+#: build/trans_presets.java:3864
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:5917
+#: build/trans_presets.java:3869
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -35224,15 +35443,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:5919
+#: build/trans_presets.java:3871
 msgid "Edit Greenhouse Horticulture"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:5925
+#: build/trans_presets.java:3877
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:5926
+#: build/trans_presets.java:3878
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -35240,25 +35459,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:5932
+#: build/trans_presets.java:3884
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:5933
+#: build/trans_presets.java:3885
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:5937
+#: build/trans_presets.java:3889
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:5938
+#: build/trans_presets.java:3890
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:5943
+#: build/trans_presets.java:3895
 msgid "Village Green"
 msgstr "Friområde"
@@ -35266,10 +35485,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:5945
+#: build/trans_presets.java:3897
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:5950
+#: build/trans_presets.java:3902
 msgid "Common"
 msgstr "Offentlig"
@@ -35277,20 +35496,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:5952
+#: build/trans_presets.java:3904
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:5956
+#: build/trans_presets.java:3908
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:5957
+#: build/trans_presets.java:3909
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:5961
+#: build/trans_presets.java:3913
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -35298,5 +35517,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:5963
+#: build/trans_presets.java:3915
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -35304,15 +35523,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:5969
+#: build/trans_presets.java:3921
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:5970
+#: build/trans_presets.java:3922
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:5975
+#: build/trans_presets.java:3927
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -35320,10 +35539,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:5977
+#: build/trans_presets.java:3929
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:6012
+#: build/trans_presets.java:3935
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -35331,40 +35550,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:6014
+#: build/trans_presets.java:3937
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:6050
+#: build/trans_presets.java:3944
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:6051
+#: build/trans_presets.java:3945
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:6056
+#: build/trans_presets.java:3950
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:6057
+#: build/trans_presets.java:3951
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:6062
+#: build/trans_presets.java:3956
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:6063
+#: build/trans_presets.java:3957
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:6068
+#: build/trans_presets.java:3962
 msgid "Garages"
 msgstr ""
@@ -35372,10 +35591,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:6070
+#: build/trans_presets.java:3964
 msgid "Edit Garages"
 msgstr ""
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:6076
+#: build/trans_presets.java:3970
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -35383,15 +35602,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:6078
+#: build/trans_presets.java:3972
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:6083
+#: build/trans_presets.java:3977
 msgid "Military"
 msgstr "Militært"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:6084
+#: build/trans_presets.java:3978
 msgid "Edit Military Landuse"
 msgstr "Rediger militært"
@@ -35399,55 +35618,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:6090
+#: build/trans_presets.java:3984
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:6091
+#: build/trans_presets.java:3985
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:6096
+#: build/trans_presets.java:3990
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:6097
+#: build/trans_presets.java:3991
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:6102
+#: build/trans_presets.java:3996
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:6103
+#: build/trans_presets.java:3997
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:6108
+#: build/trans_presets.java:4002
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:6109
+#: build/trans_presets.java:4003
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:6114
+#: build/trans_presets.java:4008
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:6115
+#: build/trans_presets.java:4009
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
 
 #. group "Annotation"
-#: build/trans_presets.java:6122
+#: build/trans_presets.java:4016
 msgid "Annotation"
 msgstr ""
@@ -35456,5 +35675,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:6126
+#: build/trans_presets.java:4020
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -35462,5 +35681,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:6128
+#: build/trans_presets.java:4022
 msgid "House number"
 msgstr "Husnummer"
@@ -35468,5 +35687,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:6130
+#: build/trans_presets.java:4024
 msgid "House name"
 msgstr "Husnavn"
@@ -35475,55 +35694,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:6131 build/trans_presets.java:6292
+#: build/trans_presets.java:4025 build/trans_presets.java:4142
 msgid "Street name"
 msgstr "Gatenavn"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:6132
+#: build/trans_presets.java:4026
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:6133
+#: build/trans_presets.java:4027
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:6134
+#: build/trans_presets.java:4028
 msgid "Country code"
 msgstr "Landskode"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:6135
+#: build/trans_presets.java:4028
 msgid "AT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:6136
+#: build/trans_presets.java:4028
 msgid "CH"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:6137
+#: build/trans_presets.java:4028
 msgid "DE"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:6138
+#: build/trans_presets.java:4028
 msgid "FR"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:6139
+#: build/trans_presets.java:4028
 msgid "GB"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:6140
+#: build/trans_presets.java:4028
 msgid "IT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:6141
+#: build/trans_presets.java:4028
 msgid "US"
 msgstr ""
@@ -35532,5 +35751,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:6148
+#: build/trans_presets.java:4034
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -35538,35 +35757,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:6150
+#: build/trans_presets.java:4036
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:6151
+#: build/trans_presets.java:4036
 msgid "odd"
 msgstr "oddetall"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:6152
+#: build/trans_presets.java:4036
 msgid "even"
 msgstr "partall"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:6154
+#: build/trans_presets.java:4036
 msgid "alphabetic"
 msgstr "alfabetisk"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:6157
+#: build/trans_presets.java:4038
 msgid "Contact"
 msgstr ""
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:6158
+#: build/trans_presets.java:4039
 msgid "Edit Contact information"
 msgstr ""
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:6167
+#: build/trans_presets.java:4048
 msgid "Image"
 msgstr "Bilde"
@@ -35576,5 +35795,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:6175
+#: build/trans_presets.java:4056
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -35586,5 +35805,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:6181 build/trans_presets.java:6204
+#: build/trans_presets.java:4062 build/trans_presets.java:4079
 msgid "outer segment"
 msgstr "ytre linjesegment"
@@ -35592,5 +35811,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:6182 build/trans_presets.java:6205
+#: build/trans_presets.java:4063 build/trans_presets.java:4080
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -35598,5 +35817,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:6185
+#: build/trans_presets.java:4066
 msgid "Boundary"
 msgstr "Grense"
@@ -35607,5 +35826,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:6190
+#: build/trans_presets.java:4071
 msgid "Edit Boundary"
 msgstr "Rediger grense"
@@ -35613,40 +35832,40 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:6194
+#: build/trans_presets.java:4075
 msgid "Boundary type"
 msgstr "Grensetype"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:6195
+#: build/trans_presets.java:4075
 msgid "administrative"
 msgstr "administrativ"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:6196
+#: build/trans_presets.java:4075
 msgid "national"
 msgstr "nasjonal"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:6197
+#: build/trans_presets.java:4075
 msgid "civil"
 msgstr "kommunegrense"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:6198
+#: build/trans_presets.java:4075
 msgid "political"
 msgstr "politisk"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:6200
+#: build/trans_presets.java:4076
 msgid "Administrative level"
 msgstr "Administrativt nivå"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:6206
+#: build/trans_presets.java:4081
 msgid "Sub area"
 msgstr "Delområde"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:6207
+#: build/trans_presets.java:4082
 msgid "Administration centre"
 msgstr "Administrativt senter"
@@ -35654,5 +35873,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:6210
+#: build/trans_presets.java:4085
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -35661,5 +35880,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:6213
+#: build/trans_presets.java:4088
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -35667,40 +35886,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:6215
+#: build/trans_presets.java:4090
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:6216
+#: build/trans_presets.java:4090
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:6217
+#: build/trans_presets.java:4090
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:6218
+#: build/trans_presets.java:4090
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:6219
+#: build/trans_presets.java:4090
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:6220
+#: build/trans_presets.java:4090
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:6221
+#: build/trans_presets.java:4090
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:6222
+#: build/trans_presets.java:4090
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -35709,15 +35928,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:6228
+#: build/trans_presets.java:4095
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:6229
+#: build/trans_presets.java:4096
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:6230
+#: build/trans_presets.java:4097
 msgid "to way"
 msgstr "til linje"
@@ -35725,5 +35944,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:6233
+#: build/trans_presets.java:4100
 msgid "Route"
 msgstr "Rute"
@@ -35732,5 +35951,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:6236
+#: build/trans_presets.java:4103
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -35738,25 +35957,25 @@
 #. <key key="type" value="route" />
 #. item "Relations/Route" combo "Route type"
-#: build/trans_presets.java:6238
+#: build/trans_presets.java:4105
 msgid "Route type"
 msgstr "Rutetype"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:6240
+#: build/trans_presets.java:4105
 msgid "bus"
 msgstr "buss"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:6241
+#: build/trans_presets.java:4105
 msgid "road"
 msgstr "vei"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:6242
+#: build/trans_presets.java:4105
 msgid "ferry"
 msgstr "ferge"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:6243
+#: build/trans_presets.java:4105
 msgid "ski"
 msgstr "ski"
@@ -35808,5 +36027,5 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:6244 build/trans_style.java:200
+#: build/trans_presets.java:4105 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
@@ -35817,15 +36036,15 @@
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:6245
+#: build/trans_presets.java:4105
 msgid "hiking"
 msgstr "tur"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:6246
+#: build/trans_presets.java:4105
 msgid "tram"
 msgstr "trikk"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:6247
+#: build/trans_presets.java:4105
 msgid "detour"
 msgstr "omkjøring"
@@ -35838,10 +36057,10 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:6249 build/trans_style.java:973
+#: build/trans_presets.java:4105 build/trans_style.java:973
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Symbol description"
-#: build/trans_presets.java:6253
+#: build/trans_presets.java:4108
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -35851,35 +36070,35 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:6256 build/trans_presets.java:6281
+#: build/trans_presets.java:4111 build/trans_presets.java:4131
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:6258
+#: build/trans_presets.java:4113
 msgid "Route state"
 msgstr "Rutetilstand"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:6259
+#: build/trans_presets.java:4113
 msgid "proposed"
 msgstr "planlagt"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:6260
+#: build/trans_presets.java:4113
 msgid "alternate"
 msgstr "alternativ"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:6261
+#: build/trans_presets.java:4113
 msgid "temporary"
 msgstr "midlertidig"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:6262
+#: build/trans_presets.java:4113
 msgid "connection"
 msgstr "forbindelse"
 
 #. item "Relations/Route" text "Color (hex)"
-#: build/trans_presets.java:6264
+#: build/trans_presets.java:4114
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -35888,30 +36107,30 @@
 #. <roles>
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:6267
+#: build/trans_presets.java:4117
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:6268
+#: build/trans_presets.java:4118
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:6269
+#: build/trans_presets.java:4119
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:6270
+#: build/trans_presets.java:4120
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:6271
+#: build/trans_presets.java:4121
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "backward halt point"
-#: build/trans_presets.java:6272
+#: build/trans_presets.java:4122
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -35919,5 +36138,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:6275
+#: build/trans_presets.java:4125
 msgid "Route network"
 msgstr ""
@@ -35925,5 +36144,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:6277
+#: build/trans_presets.java:4127
 msgid "Edit route network"
 msgstr ""
@@ -35932,5 +36151,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:6285
+#: build/trans_presets.java:4135
 msgid "member"
 msgstr ""
@@ -35938,5 +36157,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:6288
+#: build/trans_presets.java:4138
 msgid "Associated street"
 msgstr ""
@@ -35944,10 +36163,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:6290
+#: build/trans_presets.java:4140
 msgid "Edit associated street"
 msgstr ""
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:6295
+#: build/trans_presets.java:4145
 msgid "house"
 msgstr ""
@@ -39159,4 +39378,10 @@
 msgid "Test"
 msgstr "Test"
+
+#~ msgid "Enable built-in defaults"
+#~ msgstr "Benytt innebygd standardverdier"
+
+#~ msgid "Used style"
+#~ msgstr "Brukt stil"
 
 #~ msgid "Move"
@@ -40618,7 +40843,4 @@
 #~ msgstr "Fant <nd> element i ikke_linje."
 
-#~ msgid "closedway"
-#~ msgstr "stengt_vei"
-
 #~ msgid "Create duplicate way"
 #~ msgstr "Opprett kopi av linje"
@@ -41241,7 +41463,4 @@
 #~ msgstr "Klarte ikke kommunisere med tjener."
 
-#~ msgid "Proxy server host"
-#~ msgstr "Proxy-tjenerens vert"
-
 #~ msgid "Cannot read place search results from server"
 #~ msgstr "Klarte ikke lese søkeresultat om sted fra tjener"
@@ -41287,7 +41506,4 @@
 #~ msgid "Keep backup files"
 #~ msgstr "Behold sikkerhetskopier"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Kilder for objektmaler"
 
 #~ msgid ""
@@ -41483,7 +41699,4 @@
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Ukjent medlemstype for «{0}»."
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
 
 #~ msgid "Preset group ''{0}''"
