Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 26587)
+++ applications/editors/josm/i18n/po/nb.po	(revision 26611)
@@ -4,9 +4,27 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://tile.openstreetmap.org/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--true;OpenStreetMap (Mapnik B&W);tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
+#. <entry>
+#. <name>OpenStreetMap (Mapnik Black &amp; White)</name>
+#. <type>wms</type>
+#. <url><![CDATA[http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?]]></url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Hike & Bike;tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm-->
+#. <entry>
+#. <name>Hike &amp; Bike</name>
+#: build/trans_wms.java:52 build/trans_wms.java:130
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-28 16:10+0200\n"
+"POT-Creation-Date: 2011-09-02 21:25+0200\n"
 "PO-Revision-Date: 2011-07-19 17:53+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,6 +35,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-08-28 11:59+0000\n"
-"X-Generator: Launchpad (build 13794)\n"
+"X-Launchpad-Export-Date: 2011-09-02 19:15+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -26,6 +44,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:361
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:154
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -51,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:145
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103
@@ -69,5 +87,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:310
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:444
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -85,6 +103,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:254
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:510
@@ -162,6 +180,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:397
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1384
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
@@ -364,5 +382,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:99
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:157
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -388,10 +406,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:109
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:157
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:217
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
@@ -404,5 +422,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:104
@@ -447,4 +465,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:741
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
 msgid "Cancel"
 msgstr "Avbryt"
@@ -512,5 +531,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
@@ -556,6 +575,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
@@ -593,4 +612,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:35
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:37
@@ -627,5 +647,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:70
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -815,6 +835,6 @@
 msgstr "Velg minst to linjer å sammenføye."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:120
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:368
@@ -823,11 +843,19 @@
 msgstr "Kopier"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopier valgte objekter til utklippstavla."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:69
 msgid "Please select something to copy."
 msgstr "Velg noe å kopiere."
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:15
+msgid "Copy Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:16
+msgid "Copy coordinates of selected nodes to clipboard."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
@@ -1213,5 +1241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:188
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:122
@@ -1232,4 +1260,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:301
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
 msgid "OK"
 msgstr "OK"
@@ -1460,14 +1489,14 @@
 msgstr "Kunne ikke tolke Lat / Lon"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
 msgid "Rectified Image..."
 msgstr "Ortografisk korrekt bilde …"
 
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
+msgid "Download Rectified Images From Various Services"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
-msgid "Download Rectified Images From Various Services"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
 #, java-format
 msgid "WMS: {0}"
@@ -1478,26 +1507,26 @@
 #. Clipboard content gets trimmed, so matching whitespace only ensures that this
 #. service will never be selected automatically.
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:107
 msgid "Custom WMS Link"
 msgstr "Selvvalgt WMS-adresse"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:114
 msgid "Supported Rectifier Services:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:140
 msgid "Visit Homepage"
 msgstr "Gå til hjemmeside"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:151
 msgid "WMS URL or Image ID:"
 msgstr "WMS-URL eller bilde-ID:"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:157
 msgid "Add Rectified Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:209
 msgid ""
 "Couldn''t match the entered link or id to the selected service. Please try "
@@ -1505,5 +1534,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
 msgid "No valid WMS URL or id"
 msgstr "Ingen gyldig WMS-URL eller ID"
@@ -1607,7 +1636,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "up"
 msgstr "opp"
@@ -1645,7 +1674,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "down"
 msgstr "ned"
@@ -1682,5 +1711,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:443
 msgid "Cannot move objects outside of the world."
 msgstr "Kan ikke flytte objekter utenfor kartet."
@@ -1741,9 +1770,5 @@
 msgstr "Åpne fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:288
-msgid "Opening 1 file..."
-msgstr "Åpner 1 fil..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
 #, java-format
 msgid "Opening {0} file..."
@@ -1752,5 +1777,5 @@
 msgstr[1] "Åpner {0} filer..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1791,5 +1816,5 @@
 msgstr "Laster ned data"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 msgid ""
 "<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1800,28 +1825,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:184
 msgid "Orthogonalize Shape"
 msgstr "Vinkle Form"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:50
 msgid "Move nodes so all angles are 90 or 180 degrees"
 msgstr "Flytt noder slik at alle vinkler er 90 eller 180 grader"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 msgid "Orthogonalize Shape / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:83
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:113
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1830,9 +1855,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:115
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1841,22 +1866,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:153
 msgid "Selection must consist only of ways and nodes."
 msgstr "Utvalget må bestå av kun linjer og noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
 msgid "Orthogonalize"
 msgstr "Vinkle (90)"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:190
 msgid "Usage"
 msgstr "Bruk"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:191
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:279
 msgid ""
 "<html>Please make sure all selected ways head in a similar direction<br>or "
@@ -1864,5 +1889,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:419
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:432
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
@@ -1870,6 +1895,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:299
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:230
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:126
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:398
@@ -1982,5 +2007,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
 msgid "Redo"
 msgstr "Gjør om"
@@ -2117,27 +2142,27 @@
 "Velg alle data i lag som ikke er slettet. OBS uferdige data blir også valgt."
 
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43
 msgid "Show Status Report"
 msgstr "Vis statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "Vis statusrapport med informasjon for feilsøking"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
 #, java-format
 msgid "Help: {0}"
 msgstr "Hjelp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Kopier til utklippstavlen og lukk"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
@@ -2405,5 +2430,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:206
 msgid "Undo"
@@ -2825,5 +2850,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:129
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
@@ -2985,8 +3010,8 @@
 "+slipp synkroniserer audio i dette punktet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:293
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
@@ -3001,9 +3026,9 @@
 msgstr "Velg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
 msgid "Select, move, scale and rotate objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:379
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:405
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -3012,17 +3037,17 @@
 msgstr[1] "Legg til og flytt en kunstig node til {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:721
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:755
 msgid "Move elements"
 msgstr "Flytt elementer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Move them"
 msgstr "Flytt dem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Undo move"
 msgstr "Angre flytting"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:724
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:758
 #, java-format
 msgid ""
@@ -3035,9 +3060,9 @@
 "Vil du virkelig flytte dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:871
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:918
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slipp museknappen for å velge objektene i rektangelet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:873
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:920
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -3046,13 +3071,13 @@
 "nærmeste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:875
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:922
 msgid "Release the mouse button to stop rotating."
 msgstr "Slipp museknappen for å avslutte rotasjon."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:877
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:924
 msgid "Release the mouse button to stop scaling."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:879
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:926
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3205,27 +3230,23 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
-#, fuzzy
 msgid "Special targets"
-msgstr "<u>Spesialsøk:</u>"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
-#, fuzzy
-msgid ""
-"<b>type:</b> - objects with corresponding type (<b>node</b>, <b>way</b>, "
+msgid ""
+"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
 "<b>relation</b>)"
-msgstr "<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
-#, fuzzy
 msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>… – alle objekter redigert av angitt bruker"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
-#, fuzzy
 msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:</b>… – alle objekter redigert av angitt bruker"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
@@ -3251,6 +3272,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (nodes:count, nodes:"
-"min-max, nodes:min- or nodes:-max)"
+"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
+"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
 msgstr ""
 
@@ -3258,6 +3279,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 msgid ""
-"<b>tags:</b>... - objects with given number of tags (nodes:count, nodes:min-"
-"max, nodes:min- or nodes:-max)"
+"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
+"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
 msgstr ""
 
@@ -3270,6 +3291,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:222
 msgid ""
-"<b>timestamp:</b>... - objects with this timestamp (<b>2009-11-12T14:51:09Z</"
-"b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+"<b>timestamp:</b>... - objects with this timestamp (2009-11-12T14:51:09Z, "
+"2009-11-12 or T14:51 ...)"
 msgstr ""
 
@@ -3277,6 +3298,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
 msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (areasize:min-max or "
-"areasize:max)"
+"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
+"max or <b>areasize:</b>max)"
 msgstr ""
 
@@ -3589,5 +3610,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:1710 build/trans_presets.java:3619
+#: build/trans_presets.java:1723 build/trans_presets.java:3632
 msgid "Other"
 msgstr "Annet"
@@ -4316,5 +4337,5 @@
 
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:13
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
@@ -4326,5 +4347,5 @@
 #. ICON(data/)
 #. light cyan
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:14
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:64
@@ -4336,5 +4357,5 @@
 #. ICON(data/)
 #. dark blue
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
@@ -4348,10 +4369,10 @@
 #. only for display, no real type
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:18
 msgid "closedway"
 msgstr "stengt_vei"
 
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:16
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:19
 msgid "multipolygon"
 msgstr ""
@@ -4888,5 +4909,5 @@
 #. item "Relations/Multipolygon"
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4272
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -5226,5 +5247,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1090
@@ -5245,5 +5266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:624
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:253
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:191
 msgid "Please select the row to edit."
@@ -5251,5 +5272,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/AdvancedPreference.java:228
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:748
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
@@ -5373,7 +5394,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:120
-#, fuzzy
 msgid "More than one \"via\" node found"
-msgstr "enveiskjøring-egenskap på node"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
@@ -5720,5 +5740,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "railway"
 msgstr "jernbane"
@@ -5865,5 +5885,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:87
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
 msgid "Imagery"
 msgstr ""
@@ -5946,10 +5966,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:111
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:172
 msgid "Username"
 msgstr "Brukernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:114
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:180
 msgid "Password"
 msgstr "Passord"
@@ -6099,5 +6119,5 @@
 msgstr "Innstilligen  {0} er fjernet fordi den ikke lenger brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -6105,10 +6125,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
 #: build/specialmessages.java:89
 msgid "View"
 msgstr "Vis"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26
@@ -6117,5 +6137,5 @@
 msgstr "Verktøy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -6123,5 +6143,5 @@
 msgstr "Objektmaler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:222
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:224
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50
@@ -6132,5 +6152,5 @@
 msgstr "Meny: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
 msgid "Audio"
 msgstr "Audio"
@@ -6965,5 +6985,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:276
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
@@ -7091,5 +7111,5 @@
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
 msgid "all"
@@ -7337,6 +7357,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
 msgid "Download"
 msgstr "Last ned"
@@ -7404,14 +7424,14 @@
 msgstr "Slå av/på: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:308
 msgid ""
 "Selects the objects that take part in this command (unless currently deleted)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:369
 msgid "Undo the selected and all later commands"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
 msgid "Redo the selected and all earlier commands"
 msgstr ""
@@ -7659,7 +7679,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-#, fuzzy
 msgid "In conflict with:\n"
-msgstr "konflikt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
@@ -7864,10 +7883,10 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:581 build/trans_presets.java:628
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412 build/trans_presets.java:1585
-#: build/trans_presets.java:1586 build/trans_presets.java:1587
-#: build/trans_presets.java:2362 build/trans_presets.java:2709
-#: build/trans_presets.java:2710 build/trans_presets.java:2711
+#: build/trans_presets.java:581 build/trans_presets.java:640
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1599
+#: build/trans_presets.java:2375 build/trans_presets.java:2722
+#: build/trans_presets.java:2723 build/trans_presets.java:2724
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
@@ -8068,5 +8087,5 @@
 #. item "Power/Power Generator" combo "Source"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:562
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
@@ -8112,5 +8131,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4271
 msgid "Relations"
 msgstr "Relasjoner"
@@ -8249,5 +8268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:60
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:62
 msgid "Selection"
 msgstr "Utvalg"
@@ -8880,5 +8899,4 @@
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Rental" text "Name"
-#. <key key="amenity" value="car_sharing" />
 #. item "Car/Sharing" text "Name"
 #. <key key="amenity" value="motorcycle_parking" />
@@ -9551,175 +9569,175 @@
 #: build/trans_presets.java:503 build/trans_presets.java:519
 #: build/trans_presets.java:535 build/trans_presets.java:561
-#: build/trans_presets.java:598 build/trans_presets.java:620
-#: build/trans_presets.java:645 build/trans_presets.java:669
-#: build/trans_presets.java:690 build/trans_presets.java:711
-#: build/trans_presets.java:731 build/trans_presets.java:741
-#: build/trans_presets.java:752 build/trans_presets.java:814
-#: build/trans_presets.java:832 build/trans_presets.java:841
-#: build/trans_presets.java:914 build/trans_presets.java:1073
-#: build/trans_presets.java:1081 build/trans_presets.java:1089
-#: build/trans_presets.java:1097 build/trans_presets.java:1108
-#: build/trans_presets.java:1117 build/trans_presets.java:1123
-#: build/trans_presets.java:1131 build/trans_presets.java:1138
-#: build/trans_presets.java:1152 build/trans_presets.java:1159
+#: build/trans_presets.java:598 build/trans_presets.java:632
+#: build/trans_presets.java:657 build/trans_presets.java:681
+#: build/trans_presets.java:702 build/trans_presets.java:723
+#: build/trans_presets.java:743 build/trans_presets.java:753
+#: build/trans_presets.java:764 build/trans_presets.java:826
+#: build/trans_presets.java:844 build/trans_presets.java:853
+#: build/trans_presets.java:926 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1101
+#: build/trans_presets.java:1109 build/trans_presets.java:1120
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1143 build/trans_presets.java:1150
 #: build/trans_presets.java:1164 build/trans_presets.java:1171
-#: build/trans_presets.java:1176 build/trans_presets.java:1182
-#: build/trans_presets.java:1189 build/trans_presets.java:1199
-#: build/trans_presets.java:1205 build/trans_presets.java:1211
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1239
-#: build/trans_presets.java:1246 build/trans_presets.java:1252
-#: build/trans_presets.java:1269 build/trans_presets.java:1276
-#: build/trans_presets.java:1283 build/trans_presets.java:1380
-#: build/trans_presets.java:1432 build/trans_presets.java:1446
-#: build/trans_presets.java:1457 build/trans_presets.java:1470
-#: build/trans_presets.java:1483 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1519
-#: build/trans_presets.java:1530 build/trans_presets.java:1541
-#: build/trans_presets.java:1551 build/trans_presets.java:1562
-#: build/trans_presets.java:1568 build/trans_presets.java:1578
-#: build/trans_presets.java:1599 build/trans_presets.java:1631
-#: build/trans_presets.java:1641 build/trans_presets.java:1647
-#: build/trans_presets.java:1655 build/trans_presets.java:1671
-#: build/trans_presets.java:1680 build/trans_presets.java:1690
-#: build/trans_presets.java:1699 build/trans_presets.java:1723
-#: build/trans_presets.java:1731 build/trans_presets.java:1745
-#: build/trans_presets.java:1756 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:1796
-#: build/trans_presets.java:1808 build/trans_presets.java:1819
-#: build/trans_presets.java:1839 build/trans_presets.java:1854
-#: build/trans_presets.java:1862 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1954
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2005 build/trans_presets.java:2022
-#: build/trans_presets.java:2040 build/trans_presets.java:2062
-#: build/trans_presets.java:2081 build/trans_presets.java:2102
-#: build/trans_presets.java:2121 build/trans_presets.java:2138
-#: build/trans_presets.java:2157 build/trans_presets.java:2175
-#: build/trans_presets.java:2192 build/trans_presets.java:2209
-#: build/trans_presets.java:2225 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2247
-#: build/trans_presets.java:2264 build/trans_presets.java:2272
-#: build/trans_presets.java:2287 build/trans_presets.java:2297
-#: build/trans_presets.java:2309 build/trans_presets.java:2319
-#: build/trans_presets.java:2326 build/trans_presets.java:2335
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2359 build/trans_presets.java:2369
-#: build/trans_presets.java:2374 build/trans_presets.java:2382
-#: build/trans_presets.java:2389 build/trans_presets.java:2397
-#: build/trans_presets.java:2406 build/trans_presets.java:2413
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2434 build/trans_presets.java:2445
-#: build/trans_presets.java:2457 build/trans_presets.java:2463
-#: build/trans_presets.java:2470 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2500 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2521
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2546
-#: build/trans_presets.java:2556 build/trans_presets.java:2562
-#: build/trans_presets.java:2568 build/trans_presets.java:2574
-#: build/trans_presets.java:2583 build/trans_presets.java:2591
-#: build/trans_presets.java:2623 build/trans_presets.java:2701
-#: build/trans_presets.java:2719 build/trans_presets.java:2729
-#: build/trans_presets.java:2744 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2771
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2879 build/trans_presets.java:2888
-#: build/trans_presets.java:2896 build/trans_presets.java:2902
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2920 build/trans_presets.java:2926
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2952
-#: build/trans_presets.java:2961 build/trans_presets.java:2968
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2986 build/trans_presets.java:2992
-#: build/trans_presets.java:2998 build/trans_presets.java:3004
-#: build/trans_presets.java:3010 build/trans_presets.java:3016
-#: build/trans_presets.java:3022 build/trans_presets.java:3028
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1188 build/trans_presets.java:1194
+#: build/trans_presets.java:1201 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1223
+#: build/trans_presets.java:1228 build/trans_presets.java:1234
+#: build/trans_presets.java:1242 build/trans_presets.java:1251
+#: build/trans_presets.java:1258 build/trans_presets.java:1264
+#: build/trans_presets.java:1281 build/trans_presets.java:1288
+#: build/trans_presets.java:1295 build/trans_presets.java:1392
+#: build/trans_presets.java:1444 build/trans_presets.java:1458
+#: build/trans_presets.java:1469 build/trans_presets.java:1482
+#: build/trans_presets.java:1495 build/trans_presets.java:1509
+#: build/trans_presets.java:1520 build/trans_presets.java:1531
+#: build/trans_presets.java:1542 build/trans_presets.java:1553
+#: build/trans_presets.java:1563 build/trans_presets.java:1574
+#: build/trans_presets.java:1580 build/trans_presets.java:1590
+#: build/trans_presets.java:1611 build/trans_presets.java:1643
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1683
+#: build/trans_presets.java:1694 build/trans_presets.java:1703
+#: build/trans_presets.java:1712 build/trans_presets.java:1736
+#: build/trans_presets.java:1744 build/trans_presets.java:1758
+#: build/trans_presets.java:1769 build/trans_presets.java:1779
+#: build/trans_presets.java:1789 build/trans_presets.java:1809
+#: build/trans_presets.java:1821 build/trans_presets.java:1832
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:1875 build/trans_presets.java:1932
+#: build/trans_presets.java:1949 build/trans_presets.java:1967
+#: build/trans_presets.java:1984 build/trans_presets.java:2001
+#: build/trans_presets.java:2018 build/trans_presets.java:2035
+#: build/trans_presets.java:2053 build/trans_presets.java:2075
+#: build/trans_presets.java:2094 build/trans_presets.java:2115
+#: build/trans_presets.java:2134 build/trans_presets.java:2151
+#: build/trans_presets.java:2170 build/trans_presets.java:2188
+#: build/trans_presets.java:2205 build/trans_presets.java:2222
+#: build/trans_presets.java:2238 build/trans_presets.java:2245
+#: build/trans_presets.java:2253 build/trans_presets.java:2260
+#: build/trans_presets.java:2277 build/trans_presets.java:2285
+#: build/trans_presets.java:2300 build/trans_presets.java:2310
+#: build/trans_presets.java:2322 build/trans_presets.java:2332
+#: build/trans_presets.java:2339 build/trans_presets.java:2348
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2372 build/trans_presets.java:2382
+#: build/trans_presets.java:2387 build/trans_presets.java:2395
+#: build/trans_presets.java:2402 build/trans_presets.java:2410
+#: build/trans_presets.java:2419 build/trans_presets.java:2426
+#: build/trans_presets.java:2433 build/trans_presets.java:2439
+#: build/trans_presets.java:2447 build/trans_presets.java:2458
+#: build/trans_presets.java:2470 build/trans_presets.java:2476
+#: build/trans_presets.java:2483 build/trans_presets.java:2491
+#: build/trans_presets.java:2498 build/trans_presets.java:2505
+#: build/trans_presets.java:2513 build/trans_presets.java:2520
+#: build/trans_presets.java:2526 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2552 build/trans_presets.java:2559
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
+#: build/trans_presets.java:2596 build/trans_presets.java:2604
+#: build/trans_presets.java:2636 build/trans_presets.java:2714
+#: build/trans_presets.java:2732 build/trans_presets.java:2742
+#: build/trans_presets.java:2757 build/trans_presets.java:2766
+#: build/trans_presets.java:2775 build/trans_presets.java:2784
+#: build/trans_presets.java:2793 build/trans_presets.java:2799
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2892 build/trans_presets.java:2901
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2951
+#: build/trans_presets.java:2957 build/trans_presets.java:2965
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3011 build/trans_presets.java:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3041
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
 #: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3080 build/trans_presets.java:3095
-#: build/trans_presets.java:3102 build/trans_presets.java:3110
-#: build/trans_presets.java:3115 build/trans_presets.java:3130
-#: build/trans_presets.java:3137 build/trans_presets.java:3149
-#: build/trans_presets.java:3159 build/trans_presets.java:3166
-#: build/trans_presets.java:3175 build/trans_presets.java:3182
-#: build/trans_presets.java:3189 build/trans_presets.java:3195
+#: build/trans_presets.java:3074 build/trans_presets.java:3080
+#: build/trans_presets.java:3093 build/trans_presets.java:3108
+#: build/trans_presets.java:3115 build/trans_presets.java:3123
+#: build/trans_presets.java:3128 build/trans_presets.java:3143
+#: build/trans_presets.java:3150 build/trans_presets.java:3162
+#: build/trans_presets.java:3172 build/trans_presets.java:3179
+#: build/trans_presets.java:3188 build/trans_presets.java:3195
 #: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3222 build/trans_presets.java:3232
-#: build/trans_presets.java:3238 build/trans_presets.java:3249
-#: build/trans_presets.java:3269 build/trans_presets.java:3325
-#: build/trans_presets.java:3331 build/trans_presets.java:3339
-#: build/trans_presets.java:3346 build/trans_presets.java:3352
-#: build/trans_presets.java:3358 build/trans_presets.java:3364
-#: build/trans_presets.java:3369 build/trans_presets.java:3374
-#: build/trans_presets.java:3379 build/trans_presets.java:3388
-#: build/trans_presets.java:3395 build/trans_presets.java:3402
-#: build/trans_presets.java:3410 build/trans_presets.java:3417
-#: build/trans_presets.java:3425 build/trans_presets.java:3434
-#: build/trans_presets.java:3442 build/trans_presets.java:3451
-#: build/trans_presets.java:3460 build/trans_presets.java:3467
-#: build/trans_presets.java:3475 build/trans_presets.java:3481
-#: build/trans_presets.java:3489 build/trans_presets.java:3497
-#: build/trans_presets.java:3504 build/trans_presets.java:3511
-#: build/trans_presets.java:3517 build/trans_presets.java:3525
-#: build/trans_presets.java:3532 build/trans_presets.java:3538
-#: build/trans_presets.java:3546 build/trans_presets.java:3555
-#: build/trans_presets.java:3561 build/trans_presets.java:3569
-#: build/trans_presets.java:3578 build/trans_presets.java:3585
-#: build/trans_presets.java:3591 build/trans_presets.java:3600
-#: build/trans_presets.java:3609 build/trans_presets.java:3625
-#: build/trans_presets.java:3634 build/trans_presets.java:3642
-#: build/trans_presets.java:3648 build/trans_presets.java:3654
-#: build/trans_presets.java:3662 build/trans_presets.java:3671
-#: build/trans_presets.java:3680 build/trans_presets.java:3687
-#: build/trans_presets.java:3695 build/trans_presets.java:3702
-#: build/trans_presets.java:3710 build/trans_presets.java:3718
-#: build/trans_presets.java:3726 build/trans_presets.java:3735
-#: build/trans_presets.java:3744 build/trans_presets.java:3752
-#: build/trans_presets.java:3760 build/trans_presets.java:3767
-#: build/trans_presets.java:3774 build/trans_presets.java:3782
-#: build/trans_presets.java:3789 build/trans_presets.java:3797
-#: build/trans_presets.java:3824 build/trans_presets.java:3830
-#: build/trans_presets.java:3836 build/trans_presets.java:3842
-#: build/trans_presets.java:3848 build/trans_presets.java:3856
-#: build/trans_presets.java:3863 build/trans_presets.java:3870
-#: build/trans_presets.java:3877 build/trans_presets.java:3884
-#: build/trans_presets.java:3892 build/trans_presets.java:3900
-#: build/trans_presets.java:3908 build/trans_presets.java:3915
-#: build/trans_presets.java:3922 build/trans_presets.java:3929
-#: build/trans_presets.java:3938 build/trans_presets.java:3947
-#: build/trans_presets.java:3955 build/trans_presets.java:3963
-#: build/trans_presets.java:3971 build/trans_presets.java:3980
-#: build/trans_presets.java:3988 build/trans_presets.java:3998
-#: build/trans_presets.java:4008 build/trans_presets.java:4017
-#: build/trans_presets.java:4023 build/trans_presets.java:4029
-#: build/trans_presets.java:4035 build/trans_presets.java:4040
-#: build/trans_presets.java:4046 build/trans_presets.java:4056
-#: build/trans_presets.java:4062 build/trans_presets.java:4068
-#: build/trans_presets.java:4074 build/trans_presets.java:4081
-#: build/trans_presets.java:4088 build/trans_presets.java:4094
-#: build/trans_presets.java:4100 build/trans_presets.java:4107
-#: build/trans_presets.java:4113 build/trans_presets.java:4118
-#: build/trans_presets.java:4125 build/trans_presets.java:4132
-#: build/trans_presets.java:4138 build/trans_presets.java:4147
-#: build/trans_presets.java:4155 build/trans_presets.java:4161
-#: build/trans_presets.java:4167 build/trans_presets.java:4174
-#: build/trans_presets.java:4182 build/trans_presets.java:4188
+#: build/trans_presets.java:3215 build/trans_presets.java:3221
+#: build/trans_presets.java:3235 build/trans_presets.java:3245
+#: build/trans_presets.java:3251 build/trans_presets.java:3262
+#: build/trans_presets.java:3282 build/trans_presets.java:3338
+#: build/trans_presets.java:3344 build/trans_presets.java:3352
+#: build/trans_presets.java:3359 build/trans_presets.java:3365
+#: build/trans_presets.java:3371 build/trans_presets.java:3377
+#: build/trans_presets.java:3382 build/trans_presets.java:3387
+#: build/trans_presets.java:3392 build/trans_presets.java:3401
+#: build/trans_presets.java:3408 build/trans_presets.java:3415
+#: build/trans_presets.java:3423 build/trans_presets.java:3430
+#: build/trans_presets.java:3438 build/trans_presets.java:3447
+#: build/trans_presets.java:3455 build/trans_presets.java:3464
+#: build/trans_presets.java:3473 build/trans_presets.java:3480
+#: build/trans_presets.java:3488 build/trans_presets.java:3494
+#: build/trans_presets.java:3502 build/trans_presets.java:3510
+#: build/trans_presets.java:3517 build/trans_presets.java:3524
+#: build/trans_presets.java:3530 build/trans_presets.java:3538
+#: build/trans_presets.java:3545 build/trans_presets.java:3551
+#: build/trans_presets.java:3559 build/trans_presets.java:3568
+#: build/trans_presets.java:3574 build/trans_presets.java:3582
+#: build/trans_presets.java:3591 build/trans_presets.java:3598
+#: build/trans_presets.java:3604 build/trans_presets.java:3613
+#: build/trans_presets.java:3622 build/trans_presets.java:3638
+#: build/trans_presets.java:3647 build/trans_presets.java:3655
+#: build/trans_presets.java:3661 build/trans_presets.java:3667
+#: build/trans_presets.java:3675 build/trans_presets.java:3684
+#: build/trans_presets.java:3693 build/trans_presets.java:3700
+#: build/trans_presets.java:3708 build/trans_presets.java:3715
+#: build/trans_presets.java:3723 build/trans_presets.java:3731
+#: build/trans_presets.java:3739 build/trans_presets.java:3748
+#: build/trans_presets.java:3757 build/trans_presets.java:3765
+#: build/trans_presets.java:3773 build/trans_presets.java:3780
+#: build/trans_presets.java:3787 build/trans_presets.java:3795
+#: build/trans_presets.java:3802 build/trans_presets.java:3810
+#: build/trans_presets.java:3837 build/trans_presets.java:3843
+#: build/trans_presets.java:3849 build/trans_presets.java:3855
+#: build/trans_presets.java:3861 build/trans_presets.java:3869
+#: build/trans_presets.java:3876 build/trans_presets.java:3883
+#: build/trans_presets.java:3890 build/trans_presets.java:3897
+#: build/trans_presets.java:3905 build/trans_presets.java:3913
+#: build/trans_presets.java:3921 build/trans_presets.java:3928
+#: build/trans_presets.java:3935 build/trans_presets.java:3942
+#: build/trans_presets.java:3951 build/trans_presets.java:3960
+#: build/trans_presets.java:3968 build/trans_presets.java:3976
+#: build/trans_presets.java:3984 build/trans_presets.java:3993
+#: build/trans_presets.java:4001 build/trans_presets.java:4011
+#: build/trans_presets.java:4021 build/trans_presets.java:4030
+#: build/trans_presets.java:4036 build/trans_presets.java:4042
+#: build/trans_presets.java:4048 build/trans_presets.java:4053
+#: build/trans_presets.java:4059 build/trans_presets.java:4069
+#: build/trans_presets.java:4075 build/trans_presets.java:4081
+#: build/trans_presets.java:4087 build/trans_presets.java:4094
+#: build/trans_presets.java:4101 build/trans_presets.java:4107
+#: build/trans_presets.java:4113 build/trans_presets.java:4120
+#: build/trans_presets.java:4126 build/trans_presets.java:4131
+#: build/trans_presets.java:4138 build/trans_presets.java:4145
+#: build/trans_presets.java:4151 build/trans_presets.java:4160
+#: build/trans_presets.java:4168 build/trans_presets.java:4174
+#: build/trans_presets.java:4180 build/trans_presets.java:4187
 #: build/trans_presets.java:4195 build/trans_presets.java:4201
-#: build/trans_presets.java:4207 build/trans_presets.java:4213
-#: build/trans_presets.java:4219 build/trans_presets.java:4266
-#: build/trans_presets.java:4280 build/trans_presets.java:4299
-#: build/trans_presets.java:4318 build/trans_presets.java:4348
-#: build/trans_presets.java:4373
+#: build/trans_presets.java:4208 build/trans_presets.java:4214
+#: build/trans_presets.java:4220 build/trans_presets.java:4226
+#: build/trans_presets.java:4232 build/trans_presets.java:4279
+#: build/trans_presets.java:4293 build/trans_presets.java:4312
+#: build/trans_presets.java:4331 build/trans_presets.java:4361
+#: build/trans_presets.java:4386
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -10241,5 +10259,5 @@
 #. item "Facilities/Fire Hydrant" combo "Position"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgid "Position"
 msgstr ""
@@ -10814,25 +10832,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lat"
 msgstr "min. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "min lon"
 msgstr "min. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lat"
 msgstr "maks. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
 msgid "max lon"
 msgstr "maks. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "Clear textarea"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:120
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -10842,57 +10860,57 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
 msgid "Bounding Box"
 msgstr "Yttergrense for arbeidsområde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:226
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:258
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:157
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:197
 #, java-format
 msgid "The string ''{0}'' is not a valid double value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:230
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:161
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:262
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:201
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:301
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:232
 msgid "Paste URL from clipboard"
 msgstr ""
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
 msgid "Data Sources and Types:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap-data"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Select to download OSM data in the selected download area."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
-msgid "Select to download OSM data in the selected download area."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97
 msgid "Raw GPS data"
 msgstr "GPS-rådata"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:127
 msgid "Download as new layer"
 msgstr "Last ned som nytt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:128
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
@@ -10900,30 +10918,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:200
 msgid "No area selected yet"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:203
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Området er for stort; vil sandsynligvis bli avvist av tjener"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
 "Områdets størrelse OK, størrelsen vil sannsynligvis aksepteres av tjener"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:359
 msgid "Click to close the dialog and to abort downloading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
 msgid "Click to download the currently selected area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:383
 msgid "Please select a download area first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
 #, java-format
 msgid ""
@@ -11010,12 +11028,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
 #: build/specialmessages.java:84 build/trans_presets.java:480
-#: build/trans_presets.java:787 build/trans_presets.java:796
-#: build/trans_presets.java:1200 build/trans_presets.java:1580
-#: build/trans_presets.java:1692 build/trans_presets.java:2447
-#: build/trans_presets.java:2682 build/trans_presets.java:2726
-#: build/trans_presets.java:2954 build/trans_presets.java:2963
-#: build/trans_presets.java:3123 build/trans_presets.java:3239
-#: build/trans_presets.java:3999 build/trans_presets.java:4009
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:799 build/trans_presets.java:808
+#: build/trans_presets.java:1212 build/trans_presets.java:1592
+#: build/trans_presets.java:1705 build/trans_presets.java:2460
+#: build/trans_presets.java:2695 build/trans_presets.java:2739
+#: build/trans_presets.java:2967 build/trans_presets.java:2976
+#: build/trans_presets.java:3136 build/trans_presets.java:3252
+#: build/trans_presets.java:4012 build/trans_presets.java:4022
+#: build/trans_presets.java:4031
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:98
@@ -11514,5 +11532,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:103
 msgid ""
 "Warning: failed to put Credential Dialog always on top. Caught security "
@@ -11520,21 +11538,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:109
 msgid "Enter credentials for OSM API"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:116
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
 msgid "Please enter the user name of your OSM account"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:246
 msgid "Please enter the password of your OSM account"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:248
 #, java-format
 msgid ""
@@ -11543,17 +11561,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:250
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Passordet overføres ukryptert."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
 msgid "Please enter the user name for authenticating at your proxy server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:264
 msgid "Please enter the password for authenticating at your proxy server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:266
 #, java-format
 msgid ""
@@ -11562,5 +11580,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:268
 msgid ""
 "Warning: depending on the authentication method the proxy server uses the "
@@ -11568,13 +11586,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
 msgid "Authenticate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:335
 msgid "Authenticate with the supplied username and password"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:349
 msgid "Cancel authentication"
 msgstr ""
@@ -11853,10 +11871,10 @@
 #: build/trans_presets.java:504 build/trans_presets.java:520
 #: build/trans_presets.java:545 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:629
-#: build/trans_presets.java:653 build/trans_presets.java:678
-#: build/trans_presets.java:698 build/trans_presets.java:719
-#: build/trans_presets.java:1074 build/trans_presets.java:1082
-#: build/trans_presets.java:1090 build/trans_presets.java:1098
-#: build/trans_presets.java:1109 build/trans_presets.java:1386
+#: build/trans_presets.java:606 build/trans_presets.java:641
+#: build/trans_presets.java:665 build/trans_presets.java:690
+#: build/trans_presets.java:710 build/trans_presets.java:731
+#: build/trans_presets.java:1086 build/trans_presets.java:1094
+#: build/trans_presets.java:1102 build/trans_presets.java:1110
+#: build/trans_presets.java:1121 build/trans_presets.java:1398
 msgid "Layer"
 msgstr "Lag"
@@ -12337,5 +12355,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
-#: build/trans_presets.java:4321 build/trans_presets.java:4351
+#: build/trans_presets.java:4334 build/trans_presets.java:4364
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
@@ -14129,13 +14147,13 @@
 "ennå)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:241
 msgid "Enter a new key/value pair"
 msgstr "Gi en ny nøkkel med verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:263
 msgid "Change a key/value pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:281
 msgid "Values"
 msgstr ""
@@ -14516,5 +14534,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1584
 msgid "Car"
 msgstr "Bil"
@@ -14541,13 +14559,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:452 build/trans_presets.java:579
-#: build/trans_presets.java:858 build/trans_presets.java:868
-#: build/trans_presets.java:877 build/trans_presets.java:889
-#: build/trans_presets.java:903 build/trans_presets.java:925
-#: build/trans_presets.java:968 build/trans_presets.java:981
-#: build/trans_presets.java:993 build/trans_presets.java:1005
-#: build/trans_presets.java:1017 build/trans_presets.java:1029
-#: build/trans_presets.java:1039 build/trans_presets.java:1048
-#: build/trans_presets.java:1057 build/trans_presets.java:1718
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:870 build/trans_presets.java:880
+#: build/trans_presets.java:889 build/trans_presets.java:901
+#: build/trans_presets.java:915 build/trans_presets.java:937
+#: build/trans_presets.java:980 build/trans_presets.java:993
+#: build/trans_presets.java:1005 build/trans_presets.java:1017
+#: build/trans_presets.java:1029 build/trans_presets.java:1041
+#: build/trans_presets.java:1051 build/trans_presets.java:1060
+#: build/trans_presets.java:1069 build/trans_presets.java:1731
+#: build/trans_presets.java:1811
 msgid "Bicycle"
 msgstr "Sykkel"
@@ -14587,12 +14605,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:448 build/trans_presets.java:578
-#: build/trans_presets.java:857 build/trans_presets.java:867
-#: build/trans_presets.java:876 build/trans_presets.java:888
-#: build/trans_presets.java:902 build/trans_presets.java:924
-#: build/trans_presets.java:967 build/trans_presets.java:980
-#: build/trans_presets.java:992 build/trans_presets.java:1004
-#: build/trans_presets.java:1016 build/trans_presets.java:1028
-#: build/trans_presets.java:1038 build/trans_presets.java:1047
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:869 build/trans_presets.java:879
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:914 build/trans_presets.java:936
+#: build/trans_presets.java:979 build/trans_presets.java:992
+#: build/trans_presets.java:1004 build/trans_presets.java:1016
+#: build/trans_presets.java:1028 build/trans_presets.java:1040
+#: build/trans_presets.java:1050 build/trans_presets.java:1059
+#: build/trans_presets.java:1068
 msgid "Foot"
 msgstr "Til fots"
@@ -16184,21 +16202,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:68
 msgid "Min. latitude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:70
 msgid "Min. longitude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:72
 msgid "Max. latitude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:74
 msgid "Max. longitude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:84
 msgid ""
 "URL from www.openstreetmap.org (you can paste a download URL here to specify "
@@ -16959,5 +16977,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
 msgid "OSM Server Files"
 msgstr "OSM-tjenerfiler"
@@ -16989,9 +17007,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigImporter.java:40
 #, java-format
 msgid "File ''{0}'' does not exist."
 msgstr "Fila «{0}» finnes ikke"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:53
+#, java-format
+msgid "No data found in file {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:54
+msgid "Open OSM file"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:160
@@ -17077,5 +17104,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280
@@ -17084,5 +17111,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:304
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:305
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308
@@ -17090,6 +17117,6 @@
 msgstr "Ulovlig objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:331
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334
@@ -17102,8 +17129,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345
@@ -17117,5 +17144,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353
 #, java-format
@@ -17123,5 +17150,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
 #, java-format
@@ -17130,6 +17157,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388
@@ -17143,6 +17170,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:401
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:392
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391
@@ -17153,5 +17180,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414
@@ -17160,5 +17187,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:415
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:416
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419
@@ -17167,5 +17194,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:436
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:437
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440
 #, java-format
@@ -17175,5 +17202,5 @@
 "Linje med ekstern ID «{0}» inkluderer manglende node med ekstern ID «{1}»."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:449
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452
 #, java-format
@@ -17181,5 +17208,5 @@
 msgstr "Slettet node {0} er del av linje {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460
 #, java-format
@@ -17189,5 +17216,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:510
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:511
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516
 #, java-format
@@ -17197,5 +17224,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:535
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540
 #, java-format
@@ -17203,17 +17230,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
 msgid "Prepare OSM data..."
 msgstr "Klargjør OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:567
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:583
+#: ../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:221
@@ -17920,13 +17947,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Report Bug"
 msgstr "Rapporter feil"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -17935,9 +17962,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:82
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid "Unexpected Exception"
 msgstr "En uventet unntakstilstand"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:114
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:109
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -17945,5 +17972,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:118
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:113
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -17951,5 +17978,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -17958,5 +17985,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -17964,9 +17991,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
 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:148
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:139
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -18176,5 +18203,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:604
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:629
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -19007,7 +19034,6 @@
 #. Plugin multipoly-convert
 #: build/trans_plugins.java:83
-#, fuzzy
 msgid "Simply convert an area to a multipolygon."
-msgstr "Ingen ytre linje i multipolygon"
+msgstr ""
 
 #. Plugin namemanager
@@ -19415,9 +19441,9 @@
 #: build/trans_presets.java:173 build/trans_presets.java:194
 #: build/trans_presets.java:236 build/trans_presets.java:258
-#: build/trans_presets.java:1875 build/trans_presets.java:1883
-#: build/trans_presets.java:1891 build/trans_presets.java:1925
-#: build/trans_presets.java:2730 build/trans_presets.java:3271
-#: build/trans_presets.java:3287 build/trans_presets.java:4319
-#: build/trans_presets.java:4349
+#: build/trans_presets.java:1888 build/trans_presets.java:1896
+#: build/trans_presets.java:1904 build/trans_presets.java:1938
+#: build/trans_presets.java:2743 build/trans_presets.java:3284
+#: build/trans_presets.java:3300 build/trans_presets.java:4332
+#: build/trans_presets.java:4362
 msgid "Reference"
 msgstr "Veinummer"
@@ -19471,5 +19497,5 @@
 #: build/trans_presets.java:505 build/trans_presets.java:521
 #: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1400
 msgid "Max. speed (km/h)"
 msgstr "Fartsgrense (km/t)"
@@ -19503,4 +19529,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Cycle Lane" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
@@ -19519,6 +19546,7 @@
 #: build/trans_presets.java:544 build/trans_presets.java:577
 #: build/trans_presets.java:600 build/trans_presets.java:622
-#: build/trans_presets.java:647 build/trans_presets.java:671
-#: build/trans_presets.java:713 build/trans_presets.java:1381
+#: build/trans_presets.java:634 build/trans_presets.java:659
+#: build/trans_presets.java:683 build/trans_presets.java:725
+#: build/trans_presets.java:1393
 msgid "Oneway"
 msgstr "Enveiskjøring"
@@ -19569,8 +19597,8 @@
 #: build/trans_presets.java:494 build/trans_presets.java:501
 #: build/trans_presets.java:539 build/trans_presets.java:572
-#: build/trans_presets.java:601 build/trans_presets.java:623
-#: build/trans_presets.java:648 build/trans_presets.java:672
-#: build/trans_presets.java:692 build/trans_presets.java:714
-#: build/trans_presets.java:1382 build/trans_surveyor.java:12
+#: build/trans_presets.java:601 build/trans_presets.java:635
+#: build/trans_presets.java:660 build/trans_presets.java:684
+#: build/trans_presets.java:704 build/trans_presets.java:726
+#: build/trans_presets.java:1394 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -19613,7 +19641,7 @@
 #: build/trans_presets.java:511 build/trans_presets.java:540
 #: build/trans_presets.java:573 build/trans_presets.java:602
-#: build/trans_presets.java:624 build/trans_presets.java:649
-#: build/trans_presets.java:673 build/trans_presets.java:693
-#: build/trans_presets.java:715 build/trans_presets.java:1383
+#: build/trans_presets.java:636 build/trans_presets.java:661
+#: build/trans_presets.java:685 build/trans_presets.java:705
+#: build/trans_presets.java:727 build/trans_presets.java:1395
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -19653,8 +19681,8 @@
 #: build/trans_presets.java:427 build/trans_presets.java:486
 #: build/trans_presets.java:541 build/trans_presets.java:574
-#: build/trans_presets.java:603 build/trans_presets.java:625
-#: build/trans_presets.java:650 build/trans_presets.java:674
-#: build/trans_presets.java:694 build/trans_presets.java:716
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:603 build/trans_presets.java:637
+#: build/trans_presets.java:662 build/trans_presets.java:686
+#: build/trans_presets.java:706 build/trans_presets.java:728
+#: build/trans_presets.java:1396
 msgid "Cutting"
 msgstr "Skjæring"
@@ -19694,8 +19722,8 @@
 #: build/trans_presets.java:428 build/trans_presets.java:487
 #: build/trans_presets.java:542 build/trans_presets.java:575
-#: build/trans_presets.java:604 build/trans_presets.java:626
-#: build/trans_presets.java:651 build/trans_presets.java:675
-#: build/trans_presets.java:695 build/trans_presets.java:717
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:604 build/trans_presets.java:638
+#: build/trans_presets.java:663 build/trans_presets.java:687
+#: build/trans_presets.java:707 build/trans_presets.java:729
+#: build/trans_presets.java:1397
 msgid "Embankment"
 msgstr "Øy"
@@ -19735,8 +19763,8 @@
 #: build/trans_presets.java:408 build/trans_presets.java:429
 #: build/trans_presets.java:543 build/trans_presets.java:576
-#: build/trans_presets.java:605 build/trans_presets.java:627
-#: build/trans_presets.java:652 build/trans_presets.java:676
-#: build/trans_presets.java:696 build/trans_presets.java:718
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:605 build/trans_presets.java:639
+#: build/trans_presets.java:664 build/trans_presets.java:688
+#: build/trans_presets.java:708 build/trans_presets.java:730
+#: build/trans_presets.java:2352
 msgid "Lit"
 msgstr ""
@@ -19838,7 +19866,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "Incline"
 msgstr "Stigning"
@@ -19874,7 +19902,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "10%"
 msgstr ""
@@ -19910,7 +19938,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "-10%"
 msgstr ""
@@ -19946,7 +19974,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "10°"
 msgstr ""
@@ -19982,7 +20010,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "-10°"
 msgstr ""
@@ -20055,5 +20083,5 @@
 #. item "Ways/Dedicated Footway" check "Passing Places"
 #: build/trans_presets.java:288 build/trans_presets.java:373
-#: build/trans_presets.java:677 build/trans_presets.java:697
+#: build/trans_presets.java:689 build/trans_presets.java:709
 msgid "Passing Places"
 msgstr "Passeringspunkter"
@@ -20086,9 +20114,9 @@
 #: build/trans_presets.java:507 build/trans_presets.java:522
 #: build/trans_presets.java:550 build/trans_presets.java:587
-#: build/trans_presets.java:608 build/trans_presets.java:630
-#: build/trans_presets.java:654 build/trans_presets.java:679
-#: build/trans_presets.java:699 build/trans_presets.java:720
-#: build/trans_presets.java:1389 build/trans_presets.java:1786
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:608 build/trans_presets.java:642
+#: build/trans_presets.java:666 build/trans_presets.java:691
+#: build/trans_presets.java:711 build/trans_presets.java:732
+#: build/trans_presets.java:1401 build/trans_presets.java:1799
+#: build/trans_presets.java:1844
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
@@ -20132,7 +20160,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "Surface"
 msgstr "Veidekke"
@@ -20159,7 +20187,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "paved"
 msgstr "fast dekke"
@@ -20184,8 +20212,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "unpaved"
 msgstr "uten fast dekke"
@@ -20210,8 +20238,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "asphalt"
 msgstr ""
@@ -20238,7 +20266,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "concrete"
 msgstr "betong"
@@ -20264,8 +20292,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387 build/trans_presets.java:2694
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399 build/trans_presets.java:2707
 msgid "metal"
 msgstr ""
@@ -20292,9 +20320,9 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387 build/trans_presets.java:2384
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399 build/trans_presets.java:2397
+#: build/trans_presets.java:2707
 msgid "wood"
 msgstr "skogsområde"
@@ -20319,8 +20347,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "paving_stones"
 msgstr ""
@@ -20347,7 +20375,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "cobblestone"
 msgstr "brostein"
@@ -20374,7 +20402,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "gravel"
 msgstr "grus"
@@ -20399,8 +20427,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "pebblestone"
 msgstr ""
@@ -20425,8 +20453,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "compacted"
 msgstr ""
@@ -20451,8 +20479,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "grass_paver"
 msgstr ""
@@ -20479,7 +20507,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "grass"
 msgstr "gress"
@@ -20506,7 +20534,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "sand"
 msgstr "sand"
@@ -20534,8 +20562,8 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:2676
 msgid "ground"
 msgstr "jord"
@@ -20843,59 +20871,59 @@
 #: build/trans_presets.java:580 build/trans_presets.java:581
 #: build/trans_presets.java:582 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:628
-#: build/trans_presets.java:796 build/trans_presets.java:1297
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1581 build/trans_presets.java:1582
-#: build/trans_presets.java:1585 build/trans_presets.java:1586
-#: build/trans_presets.java:1587 build/trans_presets.java:1602
-#: build/trans_presets.java:1693 build/trans_presets.java:1705
-#: build/trans_presets.java:1706 build/trans_presets.java:1707
-#: build/trans_presets.java:1708 build/trans_presets.java:1709
-#: build/trans_presets.java:1820 build/trans_presets.java:1821
-#: build/trans_presets.java:1822 build/trans_presets.java:1940
-#: build/trans_presets.java:1941 build/trans_presets.java:1942
-#: build/trans_presets.java:1943 build/trans_presets.java:1958
-#: build/trans_presets.java:1959 build/trans_presets.java:1960
-#: build/trans_presets.java:1961 build/trans_presets.java:1974
-#: build/trans_presets.java:1975 build/trans_presets.java:1976
-#: build/trans_presets.java:1977 build/trans_presets.java:1991
-#: build/trans_presets.java:1992 build/trans_presets.java:1993
-#: build/trans_presets.java:1994 build/trans_presets.java:2009
-#: build/trans_presets.java:2010 build/trans_presets.java:2011
-#: build/trans_presets.java:2012 build/trans_presets.java:2026
-#: build/trans_presets.java:2027 build/trans_presets.java:2028
-#: build/trans_presets.java:2029 build/trans_presets.java:2043
-#: build/trans_presets.java:2044 build/trans_presets.java:2045
-#: build/trans_presets.java:2046 build/trans_presets.java:2049
-#: build/trans_presets.java:2065 build/trans_presets.java:2066
-#: build/trans_presets.java:2067 build/trans_presets.java:2068
-#: build/trans_presets.java:2088 build/trans_presets.java:2089
-#: build/trans_presets.java:2090 build/trans_presets.java:2091
-#: build/trans_presets.java:2107 build/trans_presets.java:2108
-#: build/trans_presets.java:2109 build/trans_presets.java:2110
-#: build/trans_presets.java:2124 build/trans_presets.java:2125
-#: build/trans_presets.java:2126 build/trans_presets.java:2127
-#: build/trans_presets.java:2143 build/trans_presets.java:2144
-#: build/trans_presets.java:2145 build/trans_presets.java:2146
-#: build/trans_presets.java:2162 build/trans_presets.java:2163
-#: build/trans_presets.java:2164 build/trans_presets.java:2165
-#: build/trans_presets.java:2178 build/trans_presets.java:2179
-#: build/trans_presets.java:2180 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2196
-#: build/trans_presets.java:2197 build/trans_presets.java:2198
-#: build/trans_presets.java:2212 build/trans_presets.java:2213
-#: build/trans_presets.java:2291 build/trans_presets.java:2301
-#: build/trans_presets.java:2362 build/trans_presets.java:2383
-#: build/trans_presets.java:2582 build/trans_presets.java:2634
-#: build/trans_presets.java:2635 build/trans_presets.java:2693
-#: build/trans_presets.java:2709 build/trans_presets.java:2710
-#: build/trans_presets.java:2711 build/trans_presets.java:3142
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:584 build/trans_presets.java:640
+#: build/trans_presets.java:808 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_presets.java:1381
+#: build/trans_presets.java:1593 build/trans_presets.java:1594
+#: build/trans_presets.java:1597 build/trans_presets.java:1598
+#: build/trans_presets.java:1599 build/trans_presets.java:1614
+#: build/trans_presets.java:1706 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
+#: build/trans_presets.java:1833 build/trans_presets.java:1834
+#: build/trans_presets.java:1835 build/trans_presets.java:1953
+#: build/trans_presets.java:1954 build/trans_presets.java:1955
+#: build/trans_presets.java:1956 build/trans_presets.java:1971
+#: build/trans_presets.java:1972 build/trans_presets.java:1973
+#: build/trans_presets.java:1974 build/trans_presets.java:1987
+#: build/trans_presets.java:1988 build/trans_presets.java:1989
+#: build/trans_presets.java:1990 build/trans_presets.java:2004
+#: build/trans_presets.java:2005 build/trans_presets.java:2006
+#: build/trans_presets.java:2007 build/trans_presets.java:2022
+#: build/trans_presets.java:2023 build/trans_presets.java:2024
+#: build/trans_presets.java:2025 build/trans_presets.java:2039
+#: build/trans_presets.java:2040 build/trans_presets.java:2041
+#: build/trans_presets.java:2042 build/trans_presets.java:2056
+#: build/trans_presets.java:2057 build/trans_presets.java:2058
+#: build/trans_presets.java:2059 build/trans_presets.java:2062
+#: build/trans_presets.java:2078 build/trans_presets.java:2079
+#: build/trans_presets.java:2080 build/trans_presets.java:2081
+#: build/trans_presets.java:2101 build/trans_presets.java:2102
+#: build/trans_presets.java:2103 build/trans_presets.java:2104
+#: build/trans_presets.java:2120 build/trans_presets.java:2121
+#: build/trans_presets.java:2122 build/trans_presets.java:2123
+#: build/trans_presets.java:2137 build/trans_presets.java:2138
+#: build/trans_presets.java:2139 build/trans_presets.java:2140
+#: build/trans_presets.java:2156 build/trans_presets.java:2157
+#: build/trans_presets.java:2158 build/trans_presets.java:2159
+#: build/trans_presets.java:2175 build/trans_presets.java:2176
+#: build/trans_presets.java:2177 build/trans_presets.java:2178
+#: build/trans_presets.java:2191 build/trans_presets.java:2192
+#: build/trans_presets.java:2193 build/trans_presets.java:2194
+#: build/trans_presets.java:2208 build/trans_presets.java:2209
+#: build/trans_presets.java:2210 build/trans_presets.java:2211
+#: build/trans_presets.java:2225 build/trans_presets.java:2226
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2375 build/trans_presets.java:2396
+#: build/trans_presets.java:2595 build/trans_presets.java:2647
+#: build/trans_presets.java:2648 build/trans_presets.java:2706
+#: build/trans_presets.java:2722 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:3155
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:677
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:698
@@ -21057,5 +21085,5 @@
 #: build/trans_presets.java:578 build/trans_presets.java:579
 #: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2362
+#: build/trans_presets.java:583 build/trans_presets.java:2375
 #: build/trans_style.java:169
 msgid "permissive"
@@ -21102,5 +21130,5 @@
 #: build/trans_presets.java:578 build/trans_presets.java:579
 #: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2362
+#: build/trans_presets.java:583 build/trans_presets.java:2375
 #: build/trans_style.java:174
 msgid "private"
@@ -21287,55 +21315,55 @@
 #: build/trans_presets.java:581 build/trans_presets.java:582
 #: build/trans_presets.java:583 build/trans_presets.java:584
-#: build/trans_presets.java:628 build/trans_presets.java:765
-#: build/trans_presets.java:787 build/trans_presets.java:1297
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1412 build/trans_presets.java:1581
-#: build/trans_presets.java:1582 build/trans_presets.java:1585
-#: build/trans_presets.java:1586 build/trans_presets.java:1587
-#: build/trans_presets.java:1602 build/trans_presets.java:1693
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1707 build/trans_presets.java:1708
-#: build/trans_presets.java:1709 build/trans_presets.java:1820
-#: build/trans_presets.java:1821 build/trans_presets.java:1822
-#: build/trans_presets.java:1940 build/trans_presets.java:1941
-#: build/trans_presets.java:1942 build/trans_presets.java:1943
-#: build/trans_presets.java:1958 build/trans_presets.java:1959
-#: build/trans_presets.java:1960 build/trans_presets.java:1961
-#: build/trans_presets.java:1974 build/trans_presets.java:1975
-#: build/trans_presets.java:1976 build/trans_presets.java:1977
-#: build/trans_presets.java:1991 build/trans_presets.java:1992
-#: build/trans_presets.java:1993 build/trans_presets.java:1994
-#: build/trans_presets.java:2009 build/trans_presets.java:2010
-#: build/trans_presets.java:2011 build/trans_presets.java:2012
-#: build/trans_presets.java:2026 build/trans_presets.java:2027
-#: build/trans_presets.java:2028 build/trans_presets.java:2029
-#: build/trans_presets.java:2043 build/trans_presets.java:2044
-#: build/trans_presets.java:2045 build/trans_presets.java:2046
-#: build/trans_presets.java:2049 build/trans_presets.java:2065
-#: build/trans_presets.java:2066 build/trans_presets.java:2067
-#: build/trans_presets.java:2068 build/trans_presets.java:2088
-#: build/trans_presets.java:2089 build/trans_presets.java:2090
-#: build/trans_presets.java:2091 build/trans_presets.java:2107
-#: build/trans_presets.java:2108 build/trans_presets.java:2109
-#: build/trans_presets.java:2110 build/trans_presets.java:2124
-#: build/trans_presets.java:2125 build/trans_presets.java:2126
-#: build/trans_presets.java:2127 build/trans_presets.java:2143
-#: build/trans_presets.java:2144 build/trans_presets.java:2145
-#: build/trans_presets.java:2146 build/trans_presets.java:2162
-#: build/trans_presets.java:2163 build/trans_presets.java:2164
-#: build/trans_presets.java:2165 build/trans_presets.java:2178
-#: build/trans_presets.java:2179 build/trans_presets.java:2180
-#: build/trans_presets.java:2181 build/trans_presets.java:2195
-#: build/trans_presets.java:2196 build/trans_presets.java:2197
-#: build/trans_presets.java:2198 build/trans_presets.java:2212
-#: build/trans_presets.java:2213 build/trans_presets.java:2291
-#: build/trans_presets.java:2301 build/trans_presets.java:2383
-#: build/trans_presets.java:2582 build/trans_presets.java:2634
-#: build/trans_presets.java:2635 build/trans_presets.java:2693
-#: build/trans_presets.java:2709 build/trans_presets.java:2710
-#: build/trans_presets.java:2711 build/trans_presets.java:3142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:640 build/trans_presets.java:777
+#: build/trans_presets.java:799 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_presets.java:1381
+#: build/trans_presets.java:1424 build/trans_presets.java:1593
+#: build/trans_presets.java:1594 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1599
+#: build/trans_presets.java:1614 build/trans_presets.java:1706
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1722 build/trans_presets.java:1833
+#: build/trans_presets.java:1834 build/trans_presets.java:1835
+#: build/trans_presets.java:1953 build/trans_presets.java:1954
+#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1971 build/trans_presets.java:1972
+#: build/trans_presets.java:1973 build/trans_presets.java:1974
+#: build/trans_presets.java:1987 build/trans_presets.java:1988
+#: build/trans_presets.java:1989 build/trans_presets.java:1990
+#: build/trans_presets.java:2004 build/trans_presets.java:2005
+#: build/trans_presets.java:2006 build/trans_presets.java:2007
+#: build/trans_presets.java:2022 build/trans_presets.java:2023
+#: build/trans_presets.java:2024 build/trans_presets.java:2025
+#: build/trans_presets.java:2039 build/trans_presets.java:2040
+#: build/trans_presets.java:2041 build/trans_presets.java:2042
+#: build/trans_presets.java:2056 build/trans_presets.java:2057
+#: build/trans_presets.java:2058 build/trans_presets.java:2059
+#: build/trans_presets.java:2062 build/trans_presets.java:2078
+#: build/trans_presets.java:2079 build/trans_presets.java:2080
+#: build/trans_presets.java:2081 build/trans_presets.java:2101
+#: build/trans_presets.java:2102 build/trans_presets.java:2103
+#: build/trans_presets.java:2104 build/trans_presets.java:2120
+#: build/trans_presets.java:2121 build/trans_presets.java:2122
+#: build/trans_presets.java:2123 build/trans_presets.java:2137
+#: build/trans_presets.java:2138 build/trans_presets.java:2139
+#: build/trans_presets.java:2140 build/trans_presets.java:2156
+#: build/trans_presets.java:2157 build/trans_presets.java:2158
+#: build/trans_presets.java:2159 build/trans_presets.java:2175
+#: build/trans_presets.java:2176 build/trans_presets.java:2177
+#: build/trans_presets.java:2178 build/trans_presets.java:2191
+#: build/trans_presets.java:2192 build/trans_presets.java:2193
+#: build/trans_presets.java:2194 build/trans_presets.java:2208
+#: build/trans_presets.java:2209 build/trans_presets.java:2210
+#: build/trans_presets.java:2211 build/trans_presets.java:2225
+#: build/trans_presets.java:2226 build/trans_presets.java:2304
+#: build/trans_presets.java:2314 build/trans_presets.java:2396
+#: build/trans_presets.java:2595 build/trans_presets.java:2647
+#: build/trans_presets.java:2648 build/trans_presets.java:2706
+#: build/trans_presets.java:2722 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:3155
+#: build/trans_presets.java:3238
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:678
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:699
@@ -21427,10 +21455,10 @@
 #. item "Barriers/Sally Port" check "Horse"
 #: build/trans_presets.java:449 build/trans_presets.java:580
-#: build/trans_presets.java:859 build/trans_presets.java:869
-#: build/trans_presets.java:878 build/trans_presets.java:904
-#: build/trans_presets.java:926 build/trans_presets.java:969
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1006 build/trans_presets.java:1018
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:871 build/trans_presets.java:881
+#: build/trans_presets.java:890 build/trans_presets.java:916
+#: build/trans_presets.java:938 build/trans_presets.java:981
+#: build/trans_presets.java:994 build/trans_presets.java:1006
+#: build/trans_presets.java:1018 build/trans_presets.java:1030
+#: build/trans_presets.java:1070
 msgid "Horse"
 msgstr "Hest"
@@ -21468,11 +21496,11 @@
 #. group "Motorcycle"
 #: build/trans_presets.java:454 build/trans_presets.java:548
-#: build/trans_presets.java:860 build/trans_presets.java:870
-#: build/trans_presets.java:879 build/trans_presets.java:890
-#: build/trans_presets.java:905 build/trans_presets.java:927
-#: build/trans_presets.java:970 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1019 build/trans_presets.java:1059
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:872 build/trans_presets.java:882
+#: build/trans_presets.java:891 build/trans_presets.java:902
+#: build/trans_presets.java:917 build/trans_presets.java:939
+#: build/trans_presets.java:982 build/trans_presets.java:995
+#: build/trans_presets.java:1007 build/trans_presets.java:1019
+#: build/trans_presets.java:1031 build/trans_presets.java:1071
+#: build/trans_presets.java:1699
 msgid "Motorcycle"
 msgstr "Motorsykkel"
@@ -21491,9 +21519,9 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #: build/trans_presets.java:455 build/trans_presets.java:549
-#: build/trans_presets.java:584 build/trans_presets.java:891
-#: build/trans_presets.java:906 build/trans_presets.java:928
-#: build/trans_presets.java:971 build/trans_presets.java:984
-#: build/trans_presets.java:996 build/trans_presets.java:1008
-#: build/trans_presets.java:1020 build/trans_presets.java:1060
+#: build/trans_presets.java:584 build/trans_presets.java:903
+#: build/trans_presets.java:918 build/trans_presets.java:940
+#: build/trans_presets.java:983 build/trans_presets.java:996
+#: build/trans_presets.java:1008 build/trans_presets.java:1020
+#: build/trans_presets.java:1032 build/trans_presets.java:1072
 msgid "Motorcar"
 msgstr "Motorkjøretøy"
@@ -21581,4 +21609,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. </rule>
 #.
@@ -21592,15 +21621,17 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:480 build/trans_style.java:417
-#: build/trans_style.java:423
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:417 build/trans_style.java:423
 msgid "motorway"
 msgstr "motorway"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "motorway_link"
 msgstr "motorway_link"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21615,15 +21646,17 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:480 build/trans_style.java:429
-#: build/trans_style.java:435
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:429 build/trans_style.java:435
 msgid "trunk"
 msgstr "trunk"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "trunk_link"
 msgstr "trunk_link"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21638,15 +21671,17 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:480 build/trans_style.java:441
-#: build/trans_style.java:447
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:441 build/trans_style.java:447
 msgid "primary"
 msgstr "riksvei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "primary_link"
 msgstr "tilkjørselsvei_riksvei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21661,10 +21696,11 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:480 build/trans_style.java:453
-#: build/trans_style.java:459
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:453 build/trans_style.java:459
 msgid "secondary"
 msgstr "fylkesvei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21679,15 +21715,17 @@
 #. <condition k="highway" v="tertiary_link"/>
 #. color tertiary
-#: build/trans_presets.java:480 build/trans_style.java:465
-#: build/trans_style.java:471
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:465 build/trans_style.java:471
 msgid "tertiary"
 msgstr "kommunevei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "unclassified"
 msgstr "småvei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon src="misc/landmark/plant.png"/>
 #. </rule>
@@ -21696,14 +21734,17 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:480 build/trans_style.java:2748
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:2748
 msgid "residential"
 msgstr "boligvei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "living_street"
 msgstr "gatetun"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21739,15 +21780,17 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:480 build/trans_style.java:513
-#: build/trans_style.java:3662
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:513 build/trans_style.java:3662
 msgid "service"
 msgstr "adkomstvei"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "bus_guideway"
 msgstr "trikkespor"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
 #. </rule>
@@ -21767,6 +21810,7 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:480 build/trans_style.java:698
-#: build/trans_style.java:2803 build/trans_style.java:2804
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:698 build/trans_style.java:2803
+#: build/trans_style.java:2804
 msgid "construction"
 msgstr "veiarbeid"
@@ -21968,5 +22012,5 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:571 build/trans_presets.java:2881
+#: build/trans_presets.java:571 build/trans_presets.java:2894
 msgid "intermediate"
 msgstr "middels"
@@ -21999,13 +22043,13 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:581 build/trans_presets.java:1943
-#: build/trans_presets.java:1961 build/trans_presets.java:1977
-#: build/trans_presets.java:1994 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2046
-#: build/trans_presets.java:2068 build/trans_presets.java:2091
-#: build/trans_presets.java:2110 build/trans_presets.java:2127
-#: build/trans_presets.java:2146 build/trans_presets.java:2165
-#: build/trans_presets.java:2181 build/trans_presets.java:2198
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:581 build/trans_presets.java:1956
+#: build/trans_presets.java:1974 build/trans_presets.java:1990
+#: build/trans_presets.java:2007 build/trans_presets.java:2025
+#: build/trans_presets.java:2042 build/trans_presets.java:2059
+#: build/trans_presets.java:2081 build/trans_presets.java:2104
+#: build/trans_presets.java:2123 build/trans_presets.java:2140
+#: build/trans_presets.java:2159 build/trans_presets.java:2178
+#: build/trans_presets.java:2194 build/trans_presets.java:2211
+#: build/trans_presets.java:2226
 msgid "Wheelchairs"
 msgstr ""
@@ -22035,6 +22079,167 @@
 
 #. </optional>
+#. item "Ways/Cycle Lane"
+#: build/trans_presets.java:612
+msgid "Cycle Lane"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Bicycle" />
+#. item "Ways/Cycle Lane" label "Edit Cycle Lane"
+#: build/trans_presets.java:614
+msgid "Edit Cycle Lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway"
+#: build/trans_presets.java:615
+msgid "Cycleway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#. item "Sport/Multi" combo "type" display value
+#. item "Sport/10pin" combo "type" display value
+#. item "Sport/Athletics" combo "type" display value
+#. item "Sport/Archery" combo "type" display value
+#. item "Sport/Climbing" combo "type" display value
+#. item "Sport/Canoeing" combo "type" display value
+#. item "Sport/Cycling" combo "type" display value
+#. item "Sport/Dog Racing" combo "type" display value
+#. item "Sport/Equestrian" combo "type" display value
+#. item "Sport/Horse Racing" combo "type" display value
+#. item "Sport/Gymnastics" combo "type" display value
+#. item "Sport/Skating" combo "type" display value
+#. item "Sport/Skateboard" combo "type" display value
+#. item "Sport/Swimming" combo "type" display value
+#. item "Sport/Skiing" combo "type" display value
+#. item "Sport/Shooting" combo "type" display value
+#. item "Sport (Ball)/Soccer" combo "type" display value
+#. item "Sport (Ball)/Australian Football" combo "type" display value
+#. item "Sport (Ball)/American Football" combo "type" display value
+#. item "Sport (Ball)/Canadian Football" combo "type" display value
+#. item "Sport (Ball)/Gaelic Football" combo "type" display value
+#. item "Sport (Ball)/Rugby League" combo "type" display value
+#. item "Sport (Ball)/Rugby Union" combo "type" display value
+#. item "Sport (Ball)/Baseball" combo "type" display value
+#. item "Sport (Ball)/Basketball" combo "type" display value
+#. item "Sport (Ball)/Golf" combo "type" display value
+#. item "Sport (Ball)/Boule" combo "type" display value
+#. item "Sport (Ball)/Bowls" combo "type" display value
+#. item "Sport (Ball)/Cricket" combo "type" display value
+#. item "Sport (Ball)/Cricket Nets" combo "type" display value
+#. item "Sport (Ball)/Croquet" combo "type" display value
+#. item "Sport (Ball)/Hockey" combo "type" display value
+#. item "Sport (Ball)/Pelota" combo "type" display value
+#. item "Sport (Ball)/Racquet" combo "type" display value
+#. item "Sport (Ball)/Table Tennis" combo "type" display value
+#. item "Sport (Ball)/Tennis" combo "type" display value
+#. item "Motorsport/Motorsport" combo "type" display value
+#. item "Motorsport/Karting" combo "type" display value
+#. item "Motorsport/Motocross" combo "type" display value
+#. item "Motorsport/Safety Training" combo "type" display value
+#. item "Motorsport/Model Aerodrome" combo "type" display value
+#. item "Motorsport/RC Car" combo "type" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2895
+#: build/trans_presets.java:2902 build/trans_presets.java:2910
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2928 build/trans_presets.java:2934
+#: build/trans_presets.java:2940 build/trans_presets.java:2946
+#: build/trans_presets.java:2952 build/trans_presets.java:2958
+#: build/trans_presets.java:2982 build/trans_presets.java:2988
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3012
+#: build/trans_presets.java:3018 build/trans_presets.java:3024
+#: build/trans_presets.java:3030 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081
+msgid "track"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite_lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite_track"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "share_busway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "shared_lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway left"
+#: build/trans_presets.java:616
+msgid "Cycleway left"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway right"
+#: build/trans_presets.java:617
+msgid "Cycleway right"
+msgstr ""
+
+#. item "Ways/Cycle Lane" check "Oneway (bicycle)"
+#: build/trans_presets.java:618
+msgid "Oneway (bicycle)"
+msgstr ""
+
+#. <space />
+#. item "Ways/Cycle Lane" label "Edit Highway"
+#: build/trans_presets.java:620
+msgid "Edit Highway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Highway"
+#: build/trans_presets.java:621
+msgid "Highway"
+msgstr ""
+
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:624
 msgid "Dedicated Cycleway"
 msgstr "Dedikert sykkelvei"
@@ -22052,11 +22257,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:616 build/trans_presets.java:638
-#: build/trans_presets.java:662
+#: build/trans_presets.java:628 build/trans_presets.java:650
+#: build/trans_presets.java:674
 msgid "Edit Cycleway"
 msgstr "Rediger sykkelvei"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:628
+#: build/trans_presets.java:640
 msgid "Pedestrians"
 msgstr ""
@@ -22064,5 +22269,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:634
+#: build/trans_presets.java:646
 msgid "Segregated Foot- and Cycleway"
 msgstr "Adskilt gang- og sykkelvei"
@@ -22070,5 +22275,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:670
 msgid "Combined Foot- and Cycleway"
 msgstr "Kombinert gang- og sykkelvei"
@@ -22076,5 +22281,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:683
+#: build/trans_presets.java:695
 msgid "Dedicated Footway"
 msgstr "Dedikert gangvei"
@@ -22083,5 +22288,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:686
+#: build/trans_presets.java:698
 msgid "Edit Footway"
 msgstr "Rediger gangvei"
@@ -22089,5 +22294,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:703
+#: build/trans_presets.java:715
 msgid "Steps"
 msgstr "Trapper"
@@ -22097,10 +22302,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:707
+#: build/trans_presets.java:719
 msgid "Edit Flight of Steps"
 msgstr "Rediger trapper"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:721
+#: build/trans_presets.java:733
 msgid "Amount of Steps"
 msgstr ""
@@ -22108,5 +22313,5 @@
 #. </optional>
 #. group "Waypoints"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:737
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91
 msgid "Waypoints"
@@ -22114,5 +22319,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:726
+#: build/trans_presets.java:738
 msgid "Motorway Junction"
 msgstr "Motorveikryss"
@@ -22120,10 +22325,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:728
+#: build/trans_presets.java:740
 msgid "Edit Motorway Junction"
 msgstr "Rediger motorveikryss"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:732
+#: build/trans_presets.java:744
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -22132,10 +22337,10 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:745
 msgid "Exit to"
 msgstr ""
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:735
+#: build/trans_presets.java:747
 msgid "Services"
 msgstr "Service"
@@ -22143,5 +22348,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:749
 msgid "Edit Service Station"
 msgstr "Rediger Serviceområde"
@@ -22157,4 +22362,5 @@
 #. item "Car/Tyres" text "Operator"
 #. item "Car/Rental" text "Operator"
+#. <key key="amenity" value="car_sharing" />
 #. item "Car/Sharing" text "Operator"
 #. item "Motorcycle/Motorcycle Dealer" text "Operator"
@@ -22234,42 +22440,42 @@
 #. item "Relations/Directional Route (North America)" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:742 build/trans_presets.java:915
-#: build/trans_presets.java:1600 build/trans_presets.java:1624
-#: build/trans_presets.java:1633 build/trans_presets.java:1642
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1673 build/trans_presets.java:1682
-#: build/trans_presets.java:1701 build/trans_presets.java:1840
-#: build/trans_presets.java:1937 build/trans_presets.java:1955
-#: build/trans_presets.java:2006 build/trans_presets.java:2023
-#: build/trans_presets.java:2082 build/trans_presets.java:2103
-#: build/trans_presets.java:2139 build/trans_presets.java:2158
-#: build/trans_presets.java:2289 build/trans_presets.java:2299
-#: build/trans_presets.java:2360 build/trans_presets.java:2446
-#: build/trans_presets.java:2471 build/trans_presets.java:2514
-#: build/trans_presets.java:2547 build/trans_presets.java:2575
-#: build/trans_presets.java:2592 build/trans_presets.java:2600
-#: build/trans_presets.java:2612 build/trans_presets.java:2632
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2731 build/trans_presets.java:2953
-#: build/trans_presets.java:2962 build/trans_presets.java:3084
-#: build/trans_presets.java:3103 build/trans_presets.java:3122
-#: build/trans_presets.java:3140 build/trans_presets.java:3151
-#: build/trans_presets.java:3167 build/trans_presets.java:3223
-#: build/trans_presets.java:3270 build/trans_presets.java:3278
-#: build/trans_presets.java:3286 build/trans_presets.java:3311
-#: build/trans_presets.java:3426 build/trans_presets.java:3435
-#: build/trans_presets.java:3452 build/trans_presets.java:3461
-#: build/trans_presets.java:3498 build/trans_presets.java:3547
-#: build/trans_presets.java:3570 build/trans_presets.java:3579
-#: build/trans_presets.java:3601 build/trans_presets.java:3616
-#: build/trans_presets.java:3626 build/trans_presets.java:3635
-#: build/trans_presets.java:3663 build/trans_presets.java:3672
-#: build/trans_presets.java:3711 build/trans_presets.java:3727
-#: build/trans_presets.java:3736 build/trans_presets.java:3745
-#: build/trans_presets.java:3761 build/trans_presets.java:3783
-#: build/trans_presets.java:3798 build/trans_presets.java:3807
-#: build/trans_presets.java:4082 build/trans_presets.java:4175
-#: build/trans_presets.java:4324 build/trans_presets.java:4354
-#: build/trans_presets.java:4376
+#: build/trans_presets.java:754 build/trans_presets.java:927
+#: build/trans_presets.java:1612 build/trans_presets.java:1636
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1661 build/trans_presets.java:1669
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1714 build/trans_presets.java:1853
+#: build/trans_presets.java:1950 build/trans_presets.java:1968
+#: build/trans_presets.java:2019 build/trans_presets.java:2036
+#: build/trans_presets.java:2095 build/trans_presets.java:2116
+#: build/trans_presets.java:2152 build/trans_presets.java:2171
+#: build/trans_presets.java:2302 build/trans_presets.java:2312
+#: build/trans_presets.java:2373 build/trans_presets.java:2459
+#: build/trans_presets.java:2484 build/trans_presets.java:2527
+#: build/trans_presets.java:2560 build/trans_presets.java:2588
+#: build/trans_presets.java:2605 build/trans_presets.java:2613
+#: build/trans_presets.java:2625 build/trans_presets.java:2645
+#: build/trans_presets.java:2654 build/trans_presets.java:2661
+#: build/trans_presets.java:2744 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:3097
+#: build/trans_presets.java:3116 build/trans_presets.java:3135
+#: build/trans_presets.java:3153 build/trans_presets.java:3164
+#: build/trans_presets.java:3180 build/trans_presets.java:3236
+#: build/trans_presets.java:3283 build/trans_presets.java:3291
+#: build/trans_presets.java:3299 build/trans_presets.java:3324
+#: build/trans_presets.java:3439 build/trans_presets.java:3448
+#: build/trans_presets.java:3465 build/trans_presets.java:3474
+#: build/trans_presets.java:3511 build/trans_presets.java:3560
+#: build/trans_presets.java:3583 build/trans_presets.java:3592
+#: build/trans_presets.java:3614 build/trans_presets.java:3629
+#: build/trans_presets.java:3639 build/trans_presets.java:3648
+#: build/trans_presets.java:3676 build/trans_presets.java:3685
+#: build/trans_presets.java:3724 build/trans_presets.java:3740
+#: build/trans_presets.java:3749 build/trans_presets.java:3758
+#: build/trans_presets.java:3774 build/trans_presets.java:3796
+#: build/trans_presets.java:3811 build/trans_presets.java:3820
+#: build/trans_presets.java:4095 build/trans_presets.java:4188
+#: build/trans_presets.java:4337 build/trans_presets.java:4367
+#: build/trans_presets.java:4389
 msgid "Operator"
 msgstr "Operatør"
@@ -22278,6 +22484,6 @@
 #. item "Waypoints/Rest Area" check "Toilets"
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:743 build/trans_presets.java:753
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:755 build/trans_presets.java:765
+#: build/trans_presets.java:2641
 msgid "Toilets"
 msgstr "Toaletter"
@@ -22285,5 +22491,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:746
+#: build/trans_presets.java:758
 msgid "Rest Area"
 msgstr ""
@@ -22291,5 +22497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:748
+#: build/trans_presets.java:760
 msgid "Edit Rest Area"
 msgstr ""
@@ -22297,5 +22503,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:768
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -22305,5 +22511,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:761
+#: build/trans_presets.java:773
 msgid "Traffic Signal"
 msgstr "Trafikklys"
@@ -22313,5 +22519,5 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:765
+#: build/trans_presets.java:777
 msgid "Pedestrian crossing type"
 msgstr "Type gangfelt"
@@ -22320,6 +22526,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "uncontrolled"
 msgstr "ukontrollert"
@@ -22328,6 +22534,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "traffic_signals"
 msgstr "trafikklys"
@@ -22336,6 +22542,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "island"
 msgstr "trafikkøy"
@@ -22344,6 +22550,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "unmarked"
 msgstr "umerket"
@@ -22352,6 +22558,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:766 build/trans_presets.java:789
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:778 build/trans_presets.java:801
+#: build/trans_presets.java:1425
 msgid "Cross on horseback"
 msgstr "Kryssende ridevei"
@@ -22360,6 +22566,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:788
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:779 build/trans_presets.java:800
+#: build/trans_presets.java:1426
 msgid "Cross by bicycle"
 msgstr "Kryssende sykkelvei"
@@ -22368,11 +22574,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:768 build/trans_presets.java:790
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:1427
 msgid "Crossing attendant"
 msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:769
+#: build/trans_presets.java:781
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -22380,5 +22586,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:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "zebra"
 msgstr "zebra"
@@ -22386,5 +22592,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:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "pelican"
 msgstr "pelican"
@@ -22392,5 +22598,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:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "toucan"
 msgstr "toucan"
@@ -22398,5 +22604,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:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "puffin"
 msgstr "puffin"
@@ -22404,5 +22610,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:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "pegasus"
 msgstr "pegasus"
@@ -22410,5 +22616,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:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "tiger"
 msgstr "tiger"
@@ -22416,5 +22622,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:784
 msgid "Stop"
 msgstr "Full stopp"
@@ -22422,5 +22628,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:787
 msgid "Mini-roundabout"
 msgstr "Mini-rundkjøring"
@@ -22431,15 +22637,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:780
+#: build/trans_presets.java:792
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:780
+#: build/trans_presets.java:792
 msgid "clockwise"
 msgstr "med_klokka"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:782
+#: build/trans_presets.java:794
 msgid "Pedestrian Crossing"
 msgstr "Fotgjengerfelt"
@@ -22448,15 +22654,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:797
 msgid "Edit Crossing"
 msgstr "Rediger fotgjengerfelt"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:791
+#: build/trans_presets.java:803
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:793
+#: build/trans_presets.java:805
 msgid "Traffic Calming"
 msgstr "Fartsdemping"
@@ -22464,40 +22670,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:795
+#: build/trans_presets.java:807
 msgid "Edit Traffic Calming"
 msgstr "Rediger fartsdemping"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "bump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "chicane"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "hump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:798
+#: build/trans_presets.java:810
 msgid "Passing Place"
 msgstr "Passeringspunkt"
@@ -22505,5 +22711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:800
+#: build/trans_presets.java:812
 msgid "Edit Passing Place"
 msgstr "Rediger passeringspunkt"
@@ -22511,5 +22717,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:815
 msgid "Turning Circle"
 msgstr "Vendesirkel"
@@ -22519,5 +22725,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:808
+#: build/trans_presets.java:820
 msgid "City Limit"
 msgstr "Bygrense"
@@ -22525,15 +22731,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:810
+#: build/trans_presets.java:822
 msgid "Edit City Limit Sign"
 msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:815
+#: build/trans_presets.java:827
 msgid "Second Name"
 msgstr "Annet navn"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:817
+#: build/trans_presets.java:829
 msgid "Speed Camera"
 msgstr "Fotoboks"
@@ -22543,5 +22749,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:834
 msgid "Grit Bin"
 msgstr "Strøkasse"
@@ -22551,10 +22757,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:839
 msgid "Ford"
 msgstr "Vadested"
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:828
+#: build/trans_presets.java:840
 msgid "Edit Ford"
 msgstr "Rediger vadested"
@@ -22562,5 +22768,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:835
+#: build/trans_presets.java:847
 msgid "Mountain Pass"
 msgstr "Fjellpass"
@@ -22568,5 +22774,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:837
+#: build/trans_presets.java:849
 msgid "Edit Mountain Pass"
 msgstr "Rediger fjellpass"
@@ -22578,7 +22784,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:842 build/trans_presets.java:2024
-#: build/trans_presets.java:2273 build/trans_presets.java:3948
-#: build/trans_presets.java:3956 build/trans_presets.java:3964
+#: build/trans_presets.java:854 build/trans_presets.java:2037
+#: build/trans_presets.java:2286 build/trans_presets.java:3961
+#: build/trans_presets.java:3969 build/trans_presets.java:3977
 msgid "Elevation"
 msgstr "Høyde"
@@ -22613,18 +22819,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:843 build/trans_presets.java:1099
-#: build/trans_presets.java:1110 build/trans_presets.java:1124
-#: build/trans_presets.java:1139 build/trans_presets.java:1866
-#: build/trans_presets.java:2328 build/trans_presets.java:2399
-#: build/trans_presets.java:3326 build/trans_presets.java:3857
-#: build/trans_presets.java:3864 build/trans_presets.java:3871
-#: build/trans_presets.java:3878 build/trans_presets.java:3885
-#: build/trans_presets.java:3893 build/trans_presets.java:3901
-#: build/trans_presets.java:3909 build/trans_presets.java:3916
-#: build/trans_presets.java:3923 build/trans_presets.java:3930
-#: build/trans_presets.java:3939 build/trans_presets.java:3949
-#: build/trans_presets.java:3957 build/trans_presets.java:3965
-#: build/trans_presets.java:3972 build/trans_presets.java:3981
-#: build/trans_presets.java:3989 build/trans_presets.java:4254
+#: build/trans_presets.java:855 build/trans_presets.java:1111
+#: build/trans_presets.java:1122 build/trans_presets.java:1136
+#: build/trans_presets.java:1151 build/trans_presets.java:1879
+#: build/trans_presets.java:2341 build/trans_presets.java:2412
+#: build/trans_presets.java:3339 build/trans_presets.java:3870
+#: build/trans_presets.java:3877 build/trans_presets.java:3884
+#: build/trans_presets.java:3891 build/trans_presets.java:3898
+#: build/trans_presets.java:3906 build/trans_presets.java:3914
+#: build/trans_presets.java:3922 build/trans_presets.java:3929
+#: build/trans_presets.java:3936 build/trans_presets.java:3943
+#: build/trans_presets.java:3952 build/trans_presets.java:3962
+#: build/trans_presets.java:3970 build/trans_presets.java:3978
+#: build/trans_presets.java:3985 build/trans_presets.java:3994
+#: build/trans_presets.java:4002 build/trans_presets.java:4267
 msgid "Wikipedia"
 msgstr ""
@@ -22632,5 +22838,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:859
 msgid "Barriers"
 msgstr "Stengsel"
@@ -22638,5 +22844,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:850
+#: build/trans_presets.java:862
 msgid "Bollard"
 msgstr "Sperresøyle"
@@ -22644,5 +22850,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:864
 msgid "Edit Bollard"
 msgstr "Rediger sperresøyle"
@@ -22692,27 +22898,27 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:855 build/trans_presets.java:865
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:900 build/trans_presets.java:922
-#: build/trans_presets.java:965 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1014 build/trans_presets.java:1026
-#: build/trans_presets.java:1036 build/trans_presets.java:1045
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:867 build/trans_presets.java:877
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:912 build/trans_presets.java:934
+#: build/trans_presets.java:977 build/trans_presets.java:990
+#: build/trans_presets.java:1002 build/trans_presets.java:1014
+#: build/trans_presets.java:1026 build/trans_presets.java:1038
+#: build/trans_presets.java:1048 build/trans_presets.java:1057
+#: build/trans_presets.java:1066
 msgid "Allowed traffic:"
 msgstr "Tillatt trafikk:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:874
 msgid "Cycle Barrier"
 msgstr "Halvbommer"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:872
+#: build/trans_presets.java:884
 msgid "Block"
 msgstr "Steinblokk"
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:893
 msgid "Cattle Grid"
 msgstr "Ferist"
@@ -22720,10 +22926,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:883
+#: build/trans_presets.java:895
 msgid "Edit Cattle Grid"
 msgstr "Rediger ferist"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:905
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -22731,15 +22937,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:908
 msgid "Spikes"
 msgstr "Pigghinder"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:897
+#: build/trans_presets.java:909
 msgid "Edit Spikes"
 msgstr "Rediger pigghinder"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:920
 msgid "Toll Booth"
 msgstr "Bomstasjon"
@@ -22747,5 +22953,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:910
+#: build/trans_presets.java:922
 msgid "Edit Toll Booth"
 msgstr "Rediger bomstasjon"
@@ -22753,10 +22959,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:930
 msgid "Border Control"
 msgstr "Tollstasjon"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:931
 msgid "Edit Border Control"
 msgstr "Rediger tollstasjon"
@@ -22765,5 +22971,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:945
 msgid "Hedge"
 msgstr "Hekk"
@@ -22772,5 +22978,5 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:937
+#: build/trans_presets.java:949
 msgid "Fence"
 msgstr "Gjerde"
@@ -22779,19 +22985,17 @@
 #. <key key="barrier" value="fence" />
 #. item "Barriers/Wire Fence"
-#: build/trans_presets.java:941
-#, fuzzy
+#: build/trans_presets.java:953
 msgid "Wire Fence"
-msgstr "Gjerde"
+msgstr ""
 
 #. <key key="barrier" value="wire_fence" />
 #. item "Barriers/Wood Fence"
-#: build/trans_presets.java:944
-#, fuzzy
+#: build/trans_presets.java:956
 msgid "Wood Fence"
-msgstr "Gjerde"
+msgstr ""
 
 #. <key key="barrier" value="wood_fence" />
 #. item "Barriers/Wall"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:959
 msgid "Wall"
 msgstr "Mur"
@@ -22799,5 +23003,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:950
+#: build/trans_presets.java:962
 msgid "City Wall"
 msgstr "Bymur"
@@ -22806,5 +23010,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:966
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -22815,15 +23019,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:961
+#: build/trans_presets.java:973
 msgid "Entrance"
 msgstr "Inngang"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:974
 msgid "Edit Entrance"
 msgstr "Rediger inngang"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:985
 msgid "Gate"
 msgstr "Port"
@@ -22831,50 +23035,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:975
+#: build/trans_presets.java:987
 msgid "Edit Gate"
 msgstr "Rediger port"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:986
+#: build/trans_presets.java:998
 msgid "Lift Gate"
 msgstr "Veibom"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:987
+#: build/trans_presets.java:999
 msgid "Edit Lift Gate"
 msgstr "Rediger veibom"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:1010
 msgid "Hampshire Gate"
 msgstr "Gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:1011
 msgid "Edit Hampshire Gate"
 msgstr "Rediger gjerdestengsel"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1022
 msgid "Bump Gate"
 msgstr "Støtfangergjerde"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1023
 msgid "Edit Bump Gate"
 msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1034
 msgid "Kissing Gate"
 msgstr "Fotgjengerport"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1035
 msgid "Edit Kissing Gate"
 msgstr "Rediger fotgjengerport"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1043
 msgid "Stile"
 msgstr "Gjerdetrapp"
@@ -22882,25 +23086,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1045
 msgid "Edit Stile"
 msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1053
 msgid "Turnstile"
 msgstr "Rotasjonsport"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1054
 msgid "Edit Turnstile"
 msgstr "Rediger rotasjonsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1062
 msgid "Sally Port"
 msgstr "Sortiport"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:1063
 msgid "Edit Sally Port"
 msgstr "Rediger sortiport"
@@ -22910,6 +23114,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:1065 build/trans_presets.java:1066
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1077 build/trans_presets.java:1078
+#: build/trans_presets.java:1179
 msgid "Water"
 msgstr "Vann"
@@ -22917,5 +23121,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1080
 msgid "Drain"
 msgstr "Drenering"
@@ -22923,10 +23127,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1082
 msgid "Edit Drain"
 msgstr "Rediger drenering"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1076
+#: build/trans_presets.java:1088
 msgid "Ditch"
 msgstr "Dike"
@@ -22934,10 +23138,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1090
 msgid "Edit Ditch"
 msgstr "Rediger dike"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1084
+#: build/trans_presets.java:1096
 msgid "Stream"
 msgstr "Bekk"
@@ -22945,10 +23149,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1098
 msgid "Edit Stream"
 msgstr "Rediger bekk"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1092
+#: build/trans_presets.java:1104
 msgid "Canal"
 msgstr "Kanal"
@@ -22956,10 +23160,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1094
+#: build/trans_presets.java:1106
 msgid "Edit Canal"
 msgstr "Rediger kanal"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1113
 msgid "River"
 msgstr "Elv"
@@ -22969,5 +23173,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1105
+#: build/trans_presets.java:1117
 msgid "Edit River"
 msgstr "Rediger elv"
@@ -22975,5 +23179,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1125
 msgid "Spring"
 msgstr "Vannkilde"
@@ -22981,20 +23185,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1127
 msgid "Edit Spring"
 msgstr "Rediger vannkilde"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1131
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1132
 msgid "Edit Waterfall"
 msgstr "Rediger foss"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1138
 msgid "Weir"
 msgstr "Terskeldam"
@@ -23002,10 +23206,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1140
 msgid "Edit Weir"
 msgstr "Rediger terskeldam"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1145
 msgid "Dam"
 msgstr "Demning"
@@ -23013,10 +23217,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1147
 msgid "Edit Dam"
 msgstr "Rediger demning"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1153
 msgid "Groyne"
 msgstr ""
@@ -23024,5 +23228,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1155
 msgid "Edit Groyne"
 msgstr ""
@@ -23032,15 +23236,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1160
 msgid "Basin"
 msgstr "Basseng"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1161
 msgid "Edit Basin Landuse"
 msgstr "Rediger basseng"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1166
 msgid "Reservoir"
 msgstr "Drikkevannskilde"
@@ -23048,15 +23252,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1168
 msgid "Edit Reservoir Landuse"
 msgstr "Rediger drikkevannskilde"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1173
 msgid "Covered Reservoir"
 msgstr "Tildekt drikkevannskilde"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1174
 msgid "Edit Covered Reservoir"
 msgstr "Rediger tildekt drikkevannskilde"
@@ -23064,20 +23268,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1181
 msgid "Edit Water"
 msgstr "Rediger vann"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1185
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1186
 msgid "Edit Land"
 msgstr "Rediger land"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1190
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -23085,10 +23289,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1192
 msgid "Edit Coastline"
 msgstr "Rediger kystlinje"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1196
 msgid "Riverbank"
 msgstr "Elvebredd"
@@ -23097,5 +23301,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1199
 msgid "Edit Riverbank"
 msgstr "Rediger elvebredd"
@@ -23103,5 +23307,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1204
 msgid "Wetland"
 msgstr "Våtmarksområde"
@@ -23112,15 +23316,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:1197
+#: build/trans_presets.java:1209
 msgid "Edit Wetland"
 msgstr "Rediger våtmarksområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "swamp"
 msgstr "Sumpområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "bog"
 msgstr "Flytemyr"
@@ -23133,40 +23337,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1200 build/trans_style.java:2930
+#: build/trans_presets.java:1212 build/trans_style.java:2930
 msgid "marsh"
 msgstr "myrområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "reedbed"
 msgstr "Sivområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "saltmarsh"
 msgstr "Saltmyr"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "tidalflat"
 msgstr "Tidevannsflate"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "mangrove"
 msgstr "Mangrove"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1214
 msgid "Mud"
 msgstr "Gjørme"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
 msgid "Edit Mud"
 msgstr "Rediger gjørme"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1219
 msgid "Beach"
 msgstr "Strand"
@@ -23174,20 +23378,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1209
+#: build/trans_presets.java:1221
 msgid "Edit Beach"
 msgstr "Rediger strand"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1225
 msgid "Bay"
 msgstr "Havbukt"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Edit Bay"
 msgstr "Rediger havbukt"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1230
 msgid "Cliff"
 msgstr "Klippe"
@@ -23195,15 +23399,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1232
 msgid "Edit Cliff"
 msgstr "Rediger klippe"
 
 #. group "Shipping"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1237
 msgid "Shipping"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1238
 msgid "Ferry Terminal"
 msgstr "Fergeleie"
@@ -23211,20 +23415,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1240
 msgid "Edit Ferry Terminal"
 msgstr "Rediger fergeleie"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "Cargo"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "passengers"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "vehicle"
 msgstr ""
@@ -23310,6 +23514,6 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1231 build/trans_presets.java:4317
-#: build/trans_presets.java:4347 build/trans_style.java:189
+#: build/trans_presets.java:1243 build/trans_presets.java:4330
+#: build/trans_presets.java:4360 build/trans_style.java:189
 #: build/trans_style.java:525 build/trans_style.java:545
 #: build/trans_style.java:551 build/trans_style.java:570
@@ -23321,15 +23525,15 @@
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "hgv"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "passengers;vehicle"
 msgstr ""
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1245
 msgid "Ferry Route"
 msgstr "Fergerute"
@@ -23337,5 +23541,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1247
 msgid "Edit Ferry"
 msgstr "Rediger fergerute"
@@ -23344,15 +23548,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1255
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1244
+#: build/trans_presets.java:1256
 msgid "Edit Marina"
 msgstr "Rediger marina"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1260
 msgid "Pier"
 msgstr "Brygge"
@@ -23360,10 +23564,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1262
 msgid "Edit Pier"
 msgstr "Rediger brygge"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1266
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -23372,5 +23576,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1270
 msgid "Turning Point"
 msgstr "Snuplass"
@@ -23380,5 +23584,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1275
 msgid "Slipway"
 msgstr "Båtslipp"
@@ -23388,10 +23592,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1279
 msgid "Edit Slipway"
 msgstr "Rediger båtslipp"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1283
 msgid "Boatyard"
 msgstr "Skipsverft"
@@ -23399,10 +23603,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1285
 msgid "Edit Boatyard"
 msgstr "Rediger skipsverft"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1290
 msgid "Dock"
 msgstr "Tørrdokk"
@@ -23410,20 +23614,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:1292
 msgid "Edit Dock"
 msgstr "Rediger tørrdokk"
 
 #. group "Transport"
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1299
 msgid "Transport"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1300
 msgid "Railway"
 msgstr "Jernbane"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1301
 msgid "Rail"
 msgstr "Jernbane"
@@ -23431,5 +23635,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1303
 msgid "Edit Rail"
 msgstr "Rediger jernbane"
@@ -23459,7 +23663,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1295 build/trans_presets.java:1307
-#: build/trans_presets.java:1331 build/trans_presets.java:1343
-#: build/trans_presets.java:1355 build/trans_presets.java:1367
+#: build/trans_presets.java:1307 build/trans_presets.java:1319
+#: build/trans_presets.java:1343 build/trans_presets.java:1355
+#: build/trans_presets.java:1367 build/trans_presets.java:1379
 msgid "Gauge (mm)"
 msgstr ""
@@ -23475,8 +23679,8 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380
 msgid "Types"
 msgstr ""
@@ -23490,8 +23694,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "yard"
 msgstr "Stasjonsområde"
@@ -23505,8 +23709,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "siding"
 msgstr "Sidespor"
@@ -23520,8 +23724,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "spur"
 msgstr "Privat sidespor"
@@ -23534,8 +23738,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381
 msgid "Electrified"
 msgstr ""
@@ -23548,8 +23752,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381
 msgid "contact_line"
 msgstr ""
@@ -23610,8 +23814,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369 build/trans_style.java:595
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381 build/trans_style.java:595
 #: build/trans_style.java:958 build/trans_style.java:1008
 #: build/trans_style.java:1014 build/trans_style.java:1021
@@ -23633,9 +23837,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:1298 build/trans_presets.java:1310
-#: build/trans_presets.java:1322 build/trans_presets.java:1334
-#: build/trans_presets.java:1346 build/trans_presets.java:1358
-#: build/trans_presets.java:1370 build/trans_presets.java:1625
-#: build/trans_presets.java:3314
+#: build/trans_presets.java:1310 build/trans_presets.java:1322
+#: build/trans_presets.java:1334 build/trans_presets.java:1346
+#: build/trans_presets.java:1358 build/trans_presets.java:1370
+#: build/trans_presets.java:1382 build/trans_presets.java:1637
+#: build/trans_presets.java:3327
 msgid "Voltage"
 msgstr "Spenning"
@@ -23648,8 +23852,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1299 build/trans_presets.java:1311
-#: build/trans_presets.java:1323 build/trans_presets.java:1335
-#: build/trans_presets.java:1347 build/trans_presets.java:1359
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1335 build/trans_presets.java:1347
+#: build/trans_presets.java:1359 build/trans_presets.java:1371
+#: build/trans_presets.java:1383
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23662,8 +23866,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: build/trans_presets.java:1299 build/trans_presets.java:1311
-#: build/trans_presets.java:1323 build/trans_presets.java:1335
-#: build/trans_presets.java:1347 build/trans_presets.java:1359
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1335 build/trans_presets.java:1347
+#: build/trans_presets.java:1359 build/trans_presets.java:1371
+#: build/trans_presets.java:1383
 msgid "16.7"
 msgstr ""
@@ -23671,10 +23875,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1314
 msgid "Narrow Gauge Rail"
 msgstr "Smal jernbane"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1315
 msgid "Edit Narrow Gauge Rail"
 msgstr "Rediger smal jernbane"
@@ -23682,5 +23886,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1326
 msgid "Monorail"
 msgstr "Monorail"
@@ -23688,5 +23892,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1328
 msgid "Edit Monorail"
 msgstr "Rediger Monorail"
@@ -23694,10 +23898,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1338
 msgid "Preserved"
 msgstr "Fredet bane"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1339
 msgid "Edit Preserved Railway"
 msgstr "Rediger fredet bane"
@@ -23705,10 +23909,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1350
 msgid "Light Rail"
 msgstr "Bybane"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1351
 msgid "Edit Light Rail"
 msgstr "Rediger bybane"
@@ -23716,10 +23920,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1362
 msgid "Subway"
 msgstr "T-bane"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1363
 msgid "Edit Subway"
 msgstr "Rediger T-bane"
@@ -23727,10 +23931,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1374
 msgid "Tram"
 msgstr "Trikk"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1375
 msgid "Edit Tram"
 msgstr "Rediger trikk"
@@ -23738,5 +23942,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1386
 msgid "Bus Guideway"
 msgstr "Busspor"
@@ -23744,5 +23948,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:1376
+#: build/trans_presets.java:1388
 msgid "Edit Bus Guideway"
 msgstr "Rediger busspor"
@@ -23751,10 +23955,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:1406
 msgid "Disused Rail"
 msgstr "Nedlagt jernbane"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1407
 msgid "Edit Disused Railway"
 msgstr "Rediger nedlagt jernbane"
@@ -23763,10 +23967,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1410
 msgid "Optional Types"
 msgstr "Alternative typer"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1412
 msgid "Abandoned Rail"
 msgstr "Revet jernbane"
@@ -23775,5 +23979,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:1416
 msgid "Level Crossing"
 msgstr "Planovergang"
@@ -23782,5 +23986,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1420
 msgid "Crossing"
 msgstr "Fotgjengerfelt"
@@ -23790,5 +23994,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1424
 msgid "Crossing type"
 msgstr "Type fotgjengerfelt"
@@ -23796,5 +24000,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1418
+#: build/trans_presets.java:1430
 msgid "Turntable"
 msgstr "Dreieskive"
@@ -23803,5 +24007,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1434
 msgid "Buffer Stop"
 msgstr ""
@@ -23810,10 +24014,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1427
+#: build/trans_presets.java:1439
 msgid "Aerialway"
 msgstr "Taubaner og -heiser"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1440
 msgid "Chair Lift"
 msgstr "Stolheis"
@@ -23821,5 +24025,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1442
 msgid "Edit Chair Lift"
 msgstr "Rediger stolheis"
@@ -23841,12 +24045,12 @@
 #. item "Facilities/Toilets" text "Reference number"
 #. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1433 build/trans_presets.java:1447
-#: build/trans_presets.java:1458 build/trans_presets.java:1471
-#: build/trans_presets.java:1484 build/trans_presets.java:1498
-#: build/trans_presets.java:1509 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1542
-#: build/trans_presets.java:1552 build/trans_presets.java:1579
-#: build/trans_presets.java:2290 build/trans_presets.java:2300
-#: build/trans_presets.java:2633 build/trans_presets.java:3808
+#: build/trans_presets.java:1445 build/trans_presets.java:1459
+#: build/trans_presets.java:1470 build/trans_presets.java:1483
+#: build/trans_presets.java:1496 build/trans_presets.java:1510
+#: build/trans_presets.java:1521 build/trans_presets.java:1532
+#: build/trans_presets.java:1543 build/trans_presets.java:1554
+#: build/trans_presets.java:1564 build/trans_presets.java:1591
+#: build/trans_presets.java:2303 build/trans_presets.java:2313
+#: build/trans_presets.java:2646 build/trans_presets.java:3821
 msgid "Reference number"
 msgstr "Referansenummer"
@@ -23872,14 +24076,14 @@
 #. <optional>
 #. item "Aerialway/Magic Carpet" text "Number of people per hour"
-#: build/trans_presets.java:1435 build/trans_presets.java:1449
-#: build/trans_presets.java:1460 build/trans_presets.java:1473
-#: build/trans_presets.java:1486 build/trans_presets.java:1500
-#: build/trans_presets.java:1511 build/trans_presets.java:1522
-#: build/trans_presets.java:1533 build/trans_presets.java:1544
+#: build/trans_presets.java:1447 build/trans_presets.java:1461
+#: build/trans_presets.java:1472 build/trans_presets.java:1485
+#: build/trans_presets.java:1498 build/trans_presets.java:1512
+#: build/trans_presets.java:1523 build/trans_presets.java:1534
+#: build/trans_presets.java:1545 build/trans_presets.java:1556
 msgid "Number of people per hour"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Number of people per chair"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1448
 msgid "Number of people per chair"
 msgstr ""
@@ -23897,10 +24101,10 @@
 #. <optional>
 #. item "Aerialway/Goods" text "Typical journey time in minutes"
-#: build/trans_presets.java:1437 build/trans_presets.java:1450
-#: build/trans_presets.java:1462 build/trans_presets.java:1475
-#: build/trans_presets.java:1488 build/trans_presets.java:1501
-#: build/trans_presets.java:1512 build/trans_presets.java:1523
-#: build/trans_presets.java:1534 build/trans_presets.java:1545
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1449 build/trans_presets.java:1462
+#: build/trans_presets.java:1474 build/trans_presets.java:1487
+#: build/trans_presets.java:1500 build/trans_presets.java:1513
+#: build/trans_presets.java:1524 build/trans_presets.java:1535
+#: build/trans_presets.java:1546 build/trans_presets.java:1557
+#: build/trans_presets.java:1566
 msgid "Typical journey time in minutes"
 msgstr ""
@@ -23908,5 +24112,5 @@
 #. item "Aerialway/Chair Lift" check "Has bubble?"
 #. item "Aerialway/Mixed Lift" check "Has bubble?"
-#: build/trans_presets.java:1438 build/trans_presets.java:1489
+#: build/trans_presets.java:1450 build/trans_presets.java:1501
 msgid "Has bubble?"
 msgstr ""
@@ -23916,13 +24120,12 @@
 #. item "Aerialway/Gondola" check "Has heating?"
 #. item "Aerialway/Mixed Lift" check "Has heating?"
-#: build/trans_presets.java:1439 build/trans_presets.java:1463
-#: build/trans_presets.java:1476 build/trans_presets.java:1490
-#, fuzzy
+#: build/trans_presets.java:1451 build/trans_presets.java:1475
+#: build/trans_presets.java:1488 build/trans_presets.java:1502
 msgid "Has heating?"
-msgstr "skøyter"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1454
 msgid "Drag Lift"
 msgstr "T-krokheis"
@@ -23930,5 +24133,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1456
 msgid "Edit Drag Lift"
 msgstr "Rediger T-krokheis"
@@ -23936,5 +24139,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1465
 msgid "Cable Car"
 msgstr "Taubane"
@@ -23942,10 +24145,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1467
 msgid "Edit Cable Car"
 msgstr "Rediger taubane"
 
 #. item "Aerialway/Cable Car" text "Number of people per car"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1473
 msgid "Number of people per car"
 msgstr ""
@@ -23953,5 +24156,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1466
+#: build/trans_presets.java:1478
 msgid "Gondola"
 msgstr "Gondolbane"
@@ -23959,10 +24162,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1480
 msgid "Edit Gondola"
 msgstr "Rediger gondolbane"
 
 #. item "Aerialway/Gondola" text "Number of people per gondola"
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1486
 msgid "Number of people per gondola"
 msgstr ""
@@ -23970,17 +24173,16 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1479
-#, fuzzy
+#: build/trans_presets.java:1491
 msgid "Mixed Lift"
-msgstr "Stolheis"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Mixed Lift" label "Edit Mixed Lift (containing both gondolas and chairs)"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1493
 msgid "Edit Mixed Lift (containing both gondolas and chairs)"
 msgstr ""
 
 #. item "Aerialway/Mixed Lift" text "Number of people per gondola/chair"
-#: build/trans_presets.java:1487
+#: build/trans_presets.java:1499
 msgid "Number of people per gondola/chair"
 msgstr ""
@@ -23988,61 +24190,53 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1493
-#, fuzzy
+#: build/trans_presets.java:1505
 msgid "T-bar Lift"
-msgstr "Stolheis"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/T-bar Lift" label "Edit T-bar Lift"
-#: build/trans_presets.java:1495
-#, fuzzy
+#: build/trans_presets.java:1507
 msgid "Edit T-bar Lift"
-msgstr "Rediger stolheis"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1504
-#, fuzzy
+#: build/trans_presets.java:1516
 msgid "J-bar Lift"
-msgstr "Stolheis"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/J-bar Lift" label "Edit J-bar Lift"
-#: build/trans_presets.java:1506
-#, fuzzy
+#: build/trans_presets.java:1518
 msgid "Edit J-bar Lift"
-msgstr "Rediger stolheis"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1515
-#, fuzzy
+#: build/trans_presets.java:1527
 msgid "Platter Lift"
-msgstr "Stolheis"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Platter Lift" label "Edit Platter Lift"
-#: build/trans_presets.java:1517
-#, fuzzy
+#: build/trans_presets.java:1529
 msgid "Edit Platter Lift"
-msgstr "Rediger stolheis"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1526
-#, fuzzy
+#: build/trans_presets.java:1538
 msgid "Rope Tow"
-msgstr "Kraftmast"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Rope Tow" label "Edit Rope Tow"
-#: build/trans_presets.java:1528
-#, fuzzy
+#: build/trans_presets.java:1540
 msgid "Edit Rope Tow"
-msgstr "Rediger kraftmast"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1549
 msgid "Magic Carpet"
 msgstr ""
@@ -24050,12 +24244,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Magic Carpet" label "Edit Magic Carpet"
-#: build/trans_presets.java:1539
-#, fuzzy
+#: build/trans_presets.java:1551
 msgid "Edit Magic Carpet"
-msgstr "Rediger taubane"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Goods"
@@ -24063,5 +24256,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1561
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24071,5 +24264,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1570
 msgctxt "aerialway"
 msgid "Station"
@@ -24078,5 +24271,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1572
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24084,5 +24277,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1576
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24091,5 +24284,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1578
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24107,6 +24300,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1573 build/trans_presets.java:1687
-#: build/trans_presets.java:1719 build/trans_surveyor.java:24
+#: build/trans_presets.java:1585 build/trans_presets.java:1700
+#: build/trans_presets.java:1732 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkering"
@@ -24115,5 +24308,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1588
 msgid "Edit Parking"
 msgstr "Rediger parkering"
@@ -24121,5 +24314,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "multi-storey"
 msgstr "P-hus"
@@ -24127,5 +24320,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "surface"
 msgstr "Overflateparkering"
@@ -24133,10 +24326,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "underground"
 msgstr "P-kjeller"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1581
+#: build/trans_presets.java:1593
 msgid "Park and Ride"
 msgstr ""
@@ -24147,7 +24340,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1582 build/trans_presets.java:1693
-#: build/trans_presets.java:2291 build/trans_presets.java:2301
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:1594 build/trans_presets.java:1706
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2647
 msgid "Fee"
 msgstr "Gebyr"
@@ -24155,25 +24348,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1596
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1597
 msgid "Spaces for Disabled"
 msgstr "Handicap-plasser"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1598
 msgid "Spaces for Women"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1587
+#: build/trans_presets.java:1599
 msgid "Spaces for Parents"
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1600
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
@@ -24181,5 +24374,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1603
 msgid "Fuel"
 msgstr "Bensinstasjon"
@@ -24189,5 +24382,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1607
 msgid "Edit Fuel"
 msgstr "Rediger bensinstasjon"
@@ -24199,120 +24392,118 @@
 #. item "Car/Tyres" text "Brand"
 #. item "Car/Rental" text "Brand"
-#. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1597 build/trans_presets.java:1632
-#: build/trans_presets.java:1648 build/trans_presets.java:1656
-#: build/trans_presets.java:1672 build/trans_presets.java:1681
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1609 build/trans_presets.java:1644
+#: build/trans_presets.java:1660 build/trans_presets.java:1668
+#: build/trans_presets.java:1684 build/trans_presets.java:1713
 msgid "Brand"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Agip"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Aral"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Avia"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "BP"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Chevron"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Citgo"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Esso"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Exxon"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Gulf"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Mobil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "OMV"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Petro-Canada"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Pioneer"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Q8"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Repsol"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Shell"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Sunoco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Statoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Tamoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Texaco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Total"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Independent"
 msgstr ""
@@ -24405,48 +24596,48 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2226
-#: build/trans_presets.java:2241 build/trans_presets.java:2327
-#: build/trans_presets.java:2338 build/trans_presets.java:2345
-#: build/trans_presets.java:2361 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2472
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2593
-#: build/trans_presets.java:2601 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3443
-#: build/trans_presets.java:3453 build/trans_presets.java:3462
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2239
+#: build/trans_presets.java:2254 build/trans_presets.java:2340
+#: build/trans_presets.java:2351 build/trans_presets.java:2358
+#: build/trans_presets.java:2374 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2485
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2606
+#: build/trans_presets.java:2614 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
 #: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3539 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3627 build/trans_presets.java:3636
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3712
-#: build/trans_presets.java:3719 build/trans_presets.java:3728
-#: build/trans_presets.java:3737 build/trans_presets.java:3746
-#: build/trans_presets.java:3753 build/trans_presets.java:3762
-#: build/trans_presets.java:3768 build/trans_presets.java:3775
-#: build/trans_presets.java:3784 build/trans_presets.java:3790
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3525 build/trans_presets.java:3531
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3552 build/trans_presets.java:3561
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3725
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3766 build/trans_presets.java:3775
+#: build/trans_presets.java:3781 build/trans_presets.java:3788
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3812
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -24537,47 +24728,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2438
-#: build/trans_presets.java:2472 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2584
-#: build/trans_presets.java:2593 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3443
-#: build/trans_presets.java:3453 build/trans_presets.java:3462
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2451
+#: build/trans_presets.java:2485 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2597
+#: build/trans_presets.java:2606 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
 #: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3539 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3627 build/trans_presets.java:3636
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3712
-#: build/trans_presets.java:3719 build/trans_presets.java:3728
-#: build/trans_presets.java:3737 build/trans_presets.java:3746
-#: build/trans_presets.java:3753 build/trans_presets.java:3762
-#: build/trans_presets.java:3768 build/trans_presets.java:3775
-#: build/trans_presets.java:3784 build/trans_presets.java:3790
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3525 build/trans_presets.java:3531
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3552 build/trans_presets.java:3561
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3725
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3766 build/trans_presets.java:3775
+#: build/trans_presets.java:3781 build/trans_presets.java:3788
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3812
 msgid "24/7"
 msgstr ""
@@ -24669,47 +24860,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2361
-#: build/trans_presets.java:2398 build/trans_presets.java:2414
-#: build/trans_presets.java:2438 build/trans_presets.java:2472
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2593
-#: build/trans_presets.java:2624 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:3332
-#: build/trans_presets.java:3340 build/trans_presets.java:3389
-#: build/trans_presets.java:3396 build/trans_presets.java:3403
-#: build/trans_presets.java:3411 build/trans_presets.java:3418
-#: build/trans_presets.java:3427 build/trans_presets.java:3436
-#: build/trans_presets.java:3443 build/trans_presets.java:3453
-#: build/trans_presets.java:3462 build/trans_presets.java:3468
-#: build/trans_presets.java:3476 build/trans_presets.java:3482
-#: build/trans_presets.java:3490 build/trans_presets.java:3499
-#: build/trans_presets.java:3505 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3526
-#: build/trans_presets.java:3533 build/trans_presets.java:3539
-#: build/trans_presets.java:3548 build/trans_presets.java:3556
-#: build/trans_presets.java:3562 build/trans_presets.java:3571
-#: build/trans_presets.java:3580 build/trans_presets.java:3586
-#: build/trans_presets.java:3592 build/trans_presets.java:3602
-#: build/trans_presets.java:3610 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3643
-#: build/trans_presets.java:3649 build/trans_presets.java:3655
-#: build/trans_presets.java:3664 build/trans_presets.java:3673
-#: build/trans_presets.java:3681 build/trans_presets.java:3688
-#: build/trans_presets.java:3696 build/trans_presets.java:3703
-#: build/trans_presets.java:3712 build/trans_presets.java:3719
-#: build/trans_presets.java:3728 build/trans_presets.java:3737
-#: build/trans_presets.java:3746 build/trans_presets.java:3753
-#: build/trans_presets.java:3762 build/trans_presets.java:3768
-#: build/trans_presets.java:3775 build/trans_presets.java:3784
-#: build/trans_presets.java:3790 build/trans_presets.java:3799
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2374
+#: build/trans_presets.java:2411 build/trans_presets.java:2427
+#: build/trans_presets.java:2451 build/trans_presets.java:2485
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2606
+#: build/trans_presets.java:2637 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:3345
+#: build/trans_presets.java:3353 build/trans_presets.java:3402
+#: build/trans_presets.java:3409 build/trans_presets.java:3416
+#: build/trans_presets.java:3424 build/trans_presets.java:3431
+#: build/trans_presets.java:3440 build/trans_presets.java:3449
+#: build/trans_presets.java:3456 build/trans_presets.java:3466
+#: build/trans_presets.java:3475 build/trans_presets.java:3481
+#: build/trans_presets.java:3489 build/trans_presets.java:3495
+#: build/trans_presets.java:3503 build/trans_presets.java:3512
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3561 build/trans_presets.java:3569
+#: build/trans_presets.java:3575 build/trans_presets.java:3584
+#: build/trans_presets.java:3593 build/trans_presets.java:3599
+#: build/trans_presets.java:3605 build/trans_presets.java:3615
+#: build/trans_presets.java:3623 build/trans_presets.java:3640
+#: build/trans_presets.java:3649 build/trans_presets.java:3656
+#: build/trans_presets.java:3662 build/trans_presets.java:3668
+#: build/trans_presets.java:3677 build/trans_presets.java:3686
+#: build/trans_presets.java:3694 build/trans_presets.java:3701
+#: build/trans_presets.java:3709 build/trans_presets.java:3716
+#: build/trans_presets.java:3725 build/trans_presets.java:3732
+#: build/trans_presets.java:3741 build/trans_presets.java:3750
+#: build/trans_presets.java:3759 build/trans_presets.java:3766
+#: build/trans_presets.java:3775 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3797
+#: build/trans_presets.java:3803 build/trans_presets.java:3812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -24779,126 +24970,126 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2438
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3443
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3505 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3526
-#: build/trans_presets.java:3533 build/trans_presets.java:3539
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3719
-#: build/trans_presets.java:3753 build/trans_presets.java:3768
-#: build/trans_presets.java:3775 build/trans_presets.java:3790
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2451
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3456
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3732
+#: build/trans_presets.java:3766 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3803
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "With shop"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "convenience"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "kiosk"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1615
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1604
+#: build/trans_presets.java:1616
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1617
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1618
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1619
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1620
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1621
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1622
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1623
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1624
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1625
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1626
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1627
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1628
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1629
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24906,5 +25097,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1632
 msgid "Charging Station"
 msgstr ""
@@ -24912,20 +25103,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:1622
+#: build/trans_presets.java:1634
 msgid "Edit Charging Station (for electric cars)"
 msgstr ""
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1638
 msgid "Amperage"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1640
 msgid "Wash"
 msgstr "Bilvask"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1641
 msgid "Edit Car Wash"
 msgstr "Rediger bilvask"
@@ -24933,5 +25124,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1649
 msgid "Car Dealer"
 msgstr "Bilforretning"
@@ -24939,5 +25130,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1651
 msgid "Edit Car Shop"
 msgstr "Rediger bilforretning"
@@ -24945,20 +25136,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1644 build/trans_presets.java:1706
+#: build/trans_presets.java:1656 build/trans_presets.java:1719
 msgid "Repair"
 msgstr "Verksted"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1657
 msgid "Edit Car Repair"
 msgstr "Rediger verksted"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1664
 msgid "Tyres"
 msgstr ""
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1665
 msgid "Edit Tyres"
 msgstr ""
@@ -24966,5 +25157,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1659 build/trans_presets.java:1711
+#: build/trans_presets.java:1671 build/trans_presets.java:1724
 msgid "Contact:"
 msgstr ""
@@ -25008,15 +25199,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1660 build/trans_presets.java:1712
-#: build/trans_presets.java:1945 build/trans_presets.java:1963
-#: build/trans_presets.java:1979 build/trans_presets.java:1996
-#: build/trans_presets.java:2014 build/trans_presets.java:2031
-#: build/trans_presets.java:2053 build/trans_presets.java:2070
-#: build/trans_presets.java:2093 build/trans_presets.java:2112
-#: build/trans_presets.java:2129 build/trans_presets.java:2148
-#: build/trans_presets.java:2167 build/trans_presets.java:2183
-#: build/trans_presets.java:2200 build/trans_presets.java:2215
-#: build/trans_presets.java:2448 build/trans_presets.java:2613
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:1672 build/trans_presets.java:1725
+#: build/trans_presets.java:1958 build/trans_presets.java:1976
+#: build/trans_presets.java:1992 build/trans_presets.java:2009
+#: build/trans_presets.java:2027 build/trans_presets.java:2044
+#: build/trans_presets.java:2066 build/trans_presets.java:2083
+#: build/trans_presets.java:2106 build/trans_presets.java:2125
+#: build/trans_presets.java:2142 build/trans_presets.java:2161
+#: build/trans_presets.java:2180 build/trans_presets.java:2196
+#: build/trans_presets.java:2213 build/trans_presets.java:2228
+#: build/trans_presets.java:2461 build/trans_presets.java:2626
+#: build/trans_presets.java:4261
 msgid "Phone Number"
 msgstr "Telefonnummer"
@@ -25041,18 +25232,19 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1661 build/trans_presets.java:1713
-#: build/trans_presets.java:1946 build/trans_presets.java:1964
-#: build/trans_presets.java:1980 build/trans_presets.java:1997
-#: build/trans_presets.java:2015 build/trans_presets.java:2032
-#: build/trans_presets.java:2054 build/trans_presets.java:2071
-#: build/trans_presets.java:2094 build/trans_presets.java:2113
-#: build/trans_presets.java:2130 build/trans_presets.java:2149
-#: build/trans_presets.java:2168 build/trans_presets.java:2184
-#: build/trans_presets.java:2201 build/trans_presets.java:2216
-#: build/trans_presets.java:4249
+#: build/trans_presets.java:1673 build/trans_presets.java:1726
+#: build/trans_presets.java:1959 build/trans_presets.java:1977
+#: build/trans_presets.java:1993 build/trans_presets.java:2010
+#: build/trans_presets.java:2028 build/trans_presets.java:2045
+#: build/trans_presets.java:2067 build/trans_presets.java:2084
+#: build/trans_presets.java:2107 build/trans_presets.java:2126
+#: build/trans_presets.java:2143 build/trans_presets.java:2162
+#: build/trans_presets.java:2181 build/trans_presets.java:2197
+#: build/trans_presets.java:2214 build/trans_presets.java:2229
+#: build/trans_presets.java:4262
 msgid "Fax Number"
 msgstr ""
 
 #. item "Car/Tyres" text "Website"
+#. item "Car/Sharing" text "Website"
 #. item "Motorcycle/Motorcycle Dealer" text "Website"
 #. item "Facilities/Accommodation/Hotel" text "Website"
@@ -25075,14 +25267,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1662 build/trans_presets.java:1714
-#: build/trans_presets.java:1947 build/trans_presets.java:1965
-#: build/trans_presets.java:1981 build/trans_presets.java:1998
-#: build/trans_presets.java:2016 build/trans_presets.java:2033
-#: build/trans_presets.java:2055 build/trans_presets.java:2072
-#: build/trans_presets.java:2095 build/trans_presets.java:2114
-#: build/trans_presets.java:2131 build/trans_presets.java:2150
-#: build/trans_presets.java:2169 build/trans_presets.java:2185
-#: build/trans_presets.java:2202 build/trans_presets.java:2217
-#: build/trans_presets.java:2449 build/trans_presets.java:4251
+#: build/trans_presets.java:1674 build/trans_presets.java:1696
+#: build/trans_presets.java:1727 build/trans_presets.java:1960
+#: build/trans_presets.java:1978 build/trans_presets.java:1994
+#: build/trans_presets.java:2011 build/trans_presets.java:2029
+#: build/trans_presets.java:2046 build/trans_presets.java:2068
+#: build/trans_presets.java:2085 build/trans_presets.java:2108
+#: build/trans_presets.java:2127 build/trans_presets.java:2144
+#: build/trans_presets.java:2163 build/trans_presets.java:2182
+#: build/trans_presets.java:2198 build/trans_presets.java:2215
+#: build/trans_presets.java:2230 build/trans_presets.java:2462
+#: build/trans_presets.java:4264
 msgid "Website"
 msgstr ""
@@ -25107,14 +25300,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1663 build/trans_presets.java:1715
-#: build/trans_presets.java:1948 build/trans_presets.java:1966
-#: build/trans_presets.java:1982 build/trans_presets.java:1999
-#: build/trans_presets.java:2017 build/trans_presets.java:2034
-#: build/trans_presets.java:2056 build/trans_presets.java:2073
-#: build/trans_presets.java:2096 build/trans_presets.java:2115
-#: build/trans_presets.java:2132 build/trans_presets.java:2151
-#: build/trans_presets.java:2170 build/trans_presets.java:2186
-#: build/trans_presets.java:2203 build/trans_presets.java:2218
-#: build/trans_presets.java:4252
+#: build/trans_presets.java:1675 build/trans_presets.java:1728
+#: build/trans_presets.java:1961 build/trans_presets.java:1979
+#: build/trans_presets.java:1995 build/trans_presets.java:2012
+#: build/trans_presets.java:2030 build/trans_presets.java:2047
+#: build/trans_presets.java:2069 build/trans_presets.java:2086
+#: build/trans_presets.java:2109 build/trans_presets.java:2128
+#: build/trans_presets.java:2145 build/trans_presets.java:2164
+#: build/trans_presets.java:2183 build/trans_presets.java:2199
+#: build/trans_presets.java:2216 build/trans_presets.java:2231
+#: build/trans_presets.java:4265
 msgid "Email Address"
 msgstr ""
@@ -25124,6 +25317,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1666 build/trans_presets.java:1705
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1678 build/trans_presets.java:1718
+#: build/trans_presets.java:1753
 msgid "Rental"
 msgstr "Utleie"
@@ -25132,10 +25325,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1681
 msgid "Edit Car Rental"
 msgstr "Rediger bilutleie"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1688
 msgid "Sharing"
 msgstr "Bildeling"
@@ -25143,21 +25336,23 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1690
 msgid "Edit Car Sharing"
 msgstr "Rediger bildeling"
 
-#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1688
-msgid "Edit Motorcycle Parking"
-msgstr ""
-
+#. item "Car/Sharing" text "Capacity"
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1691 build/trans_presets.java:1724
+#: build/trans_presets.java:1693 build/trans_presets.java:1704
+#: build/trans_presets.java:1737
 msgid "Capacity"
 msgstr "Kapasitet"
 
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#: build/trans_presets.java:1701
+msgid "Edit Motorcycle Parking"
+msgstr ""
+
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1708
 msgid "Motorcycle Dealer"
 msgstr ""
@@ -25165,25 +25360,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1710
 msgid "Edit Shop Motorcycle"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1713
 msgid "independent"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1716
 msgid "Services:"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgid "Sale"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "yes"
@@ -25191,5 +25386,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "brand"
@@ -25197,5 +25392,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "used"
@@ -25203,5 +25398,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "no"
@@ -25212,6 +25407,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1708 build/trans_presets.java:1709
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
 msgid "brand"
 msgstr ""
@@ -25219,35 +25414,35 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:1706 build/trans_presets.java:1708
+#: build/trans_presets.java:1719 build/trans_presets.java:1721
 msgid "oldtimer"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "Safety inspection"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "DEKRA"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "GTÜ"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "MOT"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "TÜV"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1721
 msgid "Parts"
 msgstr ""
@@ -25257,6 +25452,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1709 build/trans_presets.java:2678
-#: build/trans_presets.java:3485 build/trans_presets.java:3486
+#: build/trans_presets.java:1722 build/trans_presets.java:2691
+#: build/trans_presets.java:3498 build/trans_presets.java:3499
 msgid "Clothes"
 msgstr "Klær"
@@ -25264,10 +25459,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1734
 msgid "Edit Bicycle Parking"
 msgstr "Rediger sykkelparkering"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1739
 msgid "Bike Dealer"
 msgstr "Sykkelforretning"
@@ -25276,40 +25471,40 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1742
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelforretning"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1745
 msgid "Bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Second-hand bicycles are sold"
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1746
 msgid "Second-hand bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1734
+#: build/trans_presets.java:1747
 msgid "Bicycles are repaired"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1748
 msgid "Bicycles are rented"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1749
 msgid "Free bicycle pump"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Tools for do-it-yourself repair (may be a bike co-operative)"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1750
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are washed (for a fee)"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1751
 msgid "Bicycles are washed (for a fee)"
 msgstr ""
@@ -25318,10 +25513,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1756
 msgid "Edit Bicycle Rental"
 msgstr "Rediger sykkelutleie"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1761
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:38
 msgid "Public Transport"
@@ -25329,5 +25524,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1762
 msgctxt "railway"
 msgid "Station"
@@ -25337,5 +25532,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1765
 msgctxt "railway"
 msgid "Edit Station"
@@ -25343,5 +25538,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1770
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -25349,5 +25544,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:1773
 msgid "Railway Halt"
 msgstr ""
@@ -25355,5 +25550,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1775
 msgid "Edit Halt"
 msgstr "Rediger jernbanestopp"
@@ -25361,5 +25556,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1782
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -25368,5 +25563,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:1772
+#: build/trans_presets.java:1785
 msgid "Edit Tram Stop"
 msgstr "Rediger trikkestopp"
@@ -25374,5 +25569,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1792
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -25381,5 +25576,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:1782
+#: build/trans_presets.java:1795
 msgid "Edit Railway Platform"
 msgstr "Rediger jernbaneplattform"
@@ -25391,5 +25586,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1785 build/trans_presets.java:1830
+#: build/trans_presets.java:1798 build/trans_presets.java:1843
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -25398,11 +25593,11 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. item "Leisure/Dog Park" check "Area"
-#: build/trans_presets.java:1787 build/trans_presets.java:1832
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:1800 build/trans_presets.java:1845
+#: build/trans_presets.java:2349
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1802
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -25411,5 +25606,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:1792
+#: build/trans_presets.java:1805
 msgid "Edit Subway Entrance"
 msgstr "Rediger T-baneinngang"
@@ -25417,5 +25612,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1797 build/trans_presets.java:2635
+#: build/trans_presets.java:1810 build/trans_presets.java:2648
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -25424,5 +25619,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1815
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -25431,5 +25626,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:1805
+#: build/trans_presets.java:1818
 msgid "Edit Bus Station"
 msgstr "Rediger busstasjon"
@@ -25437,5 +25632,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1824
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -25445,5 +25640,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:1815
+#: build/trans_presets.java:1828
 msgid "Edit Bus Stop"
 msgstr "Rediger bussholdeplass"
@@ -25452,6 +25647,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1820 build/trans_presets.java:2698
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:1833 build/trans_presets.java:2711
+#: build/trans_presets.java:2722
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:23
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:28
@@ -25463,10 +25658,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1821 build/trans_presets.java:2690
+#: build/trans_presets.java:1834 build/trans_presets.java:2703
 msgid "Bench"
 msgstr "Benk"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1835
 msgid "Tactile Paving"
 msgstr ""
@@ -25474,10 +25669,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1839
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1840
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -25485,10 +25680,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1848
 msgid "Ticket Machine"
 msgstr ""
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1854
 msgid "Reference Number"
 msgstr ""
@@ -25497,6 +25692,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1842 build/trans_presets.java:2649
-#: build/trans_presets.java:3810
+#: build/trans_presets.java:1855 build/trans_presets.java:2662
+#: build/trans_presets.java:3823
 msgid "Coins"
 msgstr "Mynter"
@@ -25505,6 +25700,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1843 build/trans_presets.java:2650
-#: build/trans_presets.java:3811
+#: build/trans_presets.java:1856 build/trans_presets.java:2663
+#: build/trans_presets.java:3824
 msgid "Notes"
 msgstr "Sedler"
@@ -25513,6 +25708,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1844 build/trans_presets.java:2651
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:1857 build/trans_presets.java:2664
+#: build/trans_presets.java:3825
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -25521,6 +25716,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1845 build/trans_presets.java:2652
-#: build/trans_presets.java:3813
+#: build/trans_presets.java:1858 build/trans_presets.java:2665
+#: build/trans_presets.java:3826
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -25529,6 +25724,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1846 build/trans_presets.java:2653
-#: build/trans_presets.java:3814
+#: build/trans_presets.java:1859 build/trans_presets.java:2666
+#: build/trans_presets.java:3827
 msgid "Credit cards"
 msgstr "Kredittkort"
@@ -25536,10 +25731,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1847 build/trans_presets.java:3815
+#: build/trans_presets.java:1860 build/trans_presets.java:3828
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Taxi"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1863
 msgid "Taxi"
 msgstr "Taxi"
@@ -25547,5 +25742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1865
 msgid "Edit Taxi station"
 msgstr "Rediger taxi-stasjon"
@@ -25553,10 +25748,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1870
 msgid "Airport"
 msgstr "Flyplass"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1871
 msgid "Airport Ground"
 msgstr ""
@@ -25564,5 +25759,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1873
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25570,10 +25765,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1877
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1878
 msgid "ICAO"
 msgstr "ICAO"
@@ -25582,5 +25777,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1883
 msgid "Runway"
 msgstr "Rullebane"
@@ -25588,5 +25783,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1885
 msgid "Edit Runway"
 msgstr "Rediger rullebane"
@@ -25594,5 +25789,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1891
 msgid "Taxiway"
 msgstr "Taksebane"
@@ -25600,5 +25795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1893
 msgid "Edit Taxiway"
 msgstr "Rediger taksebane"
@@ -25606,5 +25801,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1899
 msgid "Helipad"
 msgstr "Helikopterdekk"
@@ -25612,5 +25807,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1901
 msgid "Edit Helipad"
 msgstr "Rediger helikopterdekk"
@@ -25620,5 +25815,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1894 build/trans_presets.java:1896
+#: build/trans_presets.java:1907 build/trans_presets.java:1909
 msgid "Apron"
 msgstr "Oppstillingsplass"
@@ -25628,5 +25823,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1899 build/trans_presets.java:1901
+#: build/trans_presets.java:1912 build/trans_presets.java:1914
 msgid "Hangar"
 msgstr "Hangar"
@@ -25637,6 +25832,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1904 build/trans_presets.java:1906
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:1917 build/trans_presets.java:1919
+#: build/trans_presets.java:3217
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -25646,5 +25841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1909 build/trans_presets.java:1911
+#: build/trans_presets.java:1922 build/trans_presets.java:1924
 msgid "Windsock"
 msgstr "Vindpølse"
@@ -25653,5 +25848,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1928
 msgid "Terminal"
 msgstr "Terminal"
@@ -25659,10 +25854,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1930
 msgid "Edit Terminal"
 msgstr "Rediger terminal"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1934
 msgctxt "airport"
 msgid "Gate"
@@ -25671,15 +25866,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1936
 msgid "Edit Terminal Gate"
 msgstr "Rediger terminalutgang"
 
 #. group "Facilities"
-#: build/trans_presets.java:1929 build/trans_presets.java:2627
+#: build/trans_presets.java:1942 build/trans_presets.java:2640
 msgid "Facilities"
 msgstr ""
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1943
 msgid "Accommodation"
 msgstr ""
@@ -25691,5 +25886,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1931 build/trans_surveyor.java:43
+#: build/trans_presets.java:1944 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -25698,5 +25893,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1947
 msgid "Edit Hotel"
 msgstr "Rediger hotell"
@@ -25710,8 +25905,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1938 build/trans_presets.java:1956
-#: build/trans_presets.java:1972 build/trans_presets.java:1989
-#: build/trans_presets.java:2007 build/trans_presets.java:2041
-#: build/trans_presets.java:2063 build/trans_presets.java:2086
+#: build/trans_presets.java:1951 build/trans_presets.java:1969
+#: build/trans_presets.java:1985 build/trans_presets.java:2002
+#: build/trans_presets.java:2020 build/trans_presets.java:2054
+#: build/trans_presets.java:2076 build/trans_presets.java:2099
 msgid "Stars"
 msgstr "Stjerner"
@@ -25747,12 +25942,12 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "Internet access"
 msgstr ""
@@ -25773,12 +25968,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "wlan"
 msgstr ""
@@ -25799,12 +25994,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "wired"
 msgstr ""
@@ -25831,12 +26026,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195 build/trans_style.java:1069
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208 build/trans_style.java:1069
 msgid "terminal"
 msgstr "stasjon"
@@ -25857,12 +26052,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1941 build/trans_presets.java:1959
-#: build/trans_presets.java:1975 build/trans_presets.java:1992
-#: build/trans_presets.java:2010 build/trans_presets.java:2027
-#: build/trans_presets.java:2044 build/trans_presets.java:2066
-#: build/trans_presets.java:2089 build/trans_presets.java:2108
-#: build/trans_presets.java:2125 build/trans_presets.java:2144
-#: build/trans_presets.java:2163 build/trans_presets.java:2179
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:1954 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2023 build/trans_presets.java:2040
+#: build/trans_presets.java:2057 build/trans_presets.java:2079
+#: build/trans_presets.java:2102 build/trans_presets.java:2121
+#: build/trans_presets.java:2138 build/trans_presets.java:2157
+#: build/trans_presets.java:2176 build/trans_presets.java:2192
+#: build/trans_presets.java:2209
 msgid "Internet access fee"
 msgstr ""
@@ -25885,12 +26080,12 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "Smoking"
 msgstr ""
@@ -25912,12 +26107,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "dedicated"
 msgstr ""
@@ -25939,12 +26134,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "separated"
 msgstr ""
@@ -25966,17 +26161,17 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "isolated"
 msgstr ""
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1963
 msgid "Motel"
 msgstr "Motell"
@@ -25984,20 +26179,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1965
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1981
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1982
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1997
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -26005,10 +26200,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1999
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2014
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -26016,15 +26211,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2016
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2032
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2033
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
@@ -26032,10 +26227,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2050
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2051
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
@@ -26043,30 +26238,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2061
 msgid "Number of places"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2062
 msgid "Requires a fee"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2062
 msgid "interval"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2063
 msgid "Power supply"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2064
 msgid "Tents allowed"
 msgstr ""
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2071
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -26074,10 +26269,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:2060
+#: build/trans_presets.java:2073
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2089
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -26088,5 +26283,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:2077 build/trans_surveyor.java:47
+#: build/trans_presets.java:2090 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26094,5 +26289,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2092
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
@@ -26101,6 +26296,6 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2153
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -26108,5 +26303,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "italian"
 msgstr "italiensk"
@@ -26114,5 +26309,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "chinese"
 msgstr "kinesisk"
@@ -26120,5 +26315,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "pizza"
 msgstr "pizza"
@@ -26126,5 +26321,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "burger"
 msgstr "gatekjøkken"
@@ -26132,5 +26327,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "greek"
 msgstr "gresk"
@@ -26138,5 +26333,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "german"
 msgstr "tysk"
@@ -26144,5 +26339,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "indian"
 msgstr "indisk"
@@ -26150,5 +26345,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "regional"
 msgstr "lokal"
@@ -26156,5 +26351,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "kebab"
 msgstr "kebab"
@@ -26162,5 +26357,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "turkish"
 msgstr "tyrkisk"
@@ -26168,5 +26363,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "asian"
 msgstr "asiatisk"
@@ -26174,5 +26369,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "thai"
 msgstr "thai"
@@ -26180,5 +26375,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "mexican"
 msgstr "meksikansk"
@@ -26186,5 +26381,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "japanese"
 msgstr "japansk"
@@ -26192,5 +26387,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "french"
 msgstr ""
@@ -26198,5 +26393,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "sandwich"
 msgstr ""
@@ -26204,5 +26399,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "sushi"
 msgstr ""
@@ -26210,10 +26405,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:2084 build/trans_presets.java:2159
+#: build/trans_presets.java:2097 build/trans_presets.java:2172
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2111
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -26221,20 +26416,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:2100
+#: build/trans_presets.java:2113
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2117
 msgid "fish_and_chips"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2117
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2130
 msgid "Food Court"
 msgstr ""
@@ -26242,10 +26437,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:2119
+#: build/trans_presets.java:2132
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2147
 msgid "Cafe"
 msgstr "Kafé"
@@ -26253,15 +26448,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2149
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2153
 msgid "ice_cream"
 msgstr ""
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2166
 msgid "Pub"
 msgstr "Pub"
@@ -26269,20 +26464,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2168
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2185
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2186
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2201
 msgid "Bar"
 msgstr "Bar"
@@ -26290,10 +26485,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2203
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2218
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -26301,25 +26496,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2220
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
 #. group "Tourism"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2234
 msgid "Tourism"
 msgstr "Turisme"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2235
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2236
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2241
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -26327,10 +26522,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2243
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2246
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
@@ -26338,20 +26533,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2249
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2256
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "Detail Grade"
 msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "topo"
 msgstr "Topografisk"
@@ -26384,5 +26579,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2248 build/trans_presets.java:4388
+#: build/trans_presets.java:2261 build/trans_presets.java:4401
 #: build/trans_style.java:477 build/trans_style.java:489
 #: build/trans_style.java:501 build/trans_style.java:507
@@ -26391,25 +26586,25 @@
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "scheme"
 msgstr "Diagram"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "Shown Area"
 msgstr "Synlig område"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "site"
 msgstr "Sted"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "city"
 msgstr "By"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "region"
 msgstr "Region"
@@ -26418,6 +26613,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2250 build/trans_presets.java:2266
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2263 build/trans_presets.java:2279
+#: build/trans_presets.java:2323
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
@@ -26427,5 +26622,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2252 build/trans_presets.java:2275
+#: build/trans_presets.java:2265 build/trans_presets.java:2288
 msgid "Routes shown for:"
 msgstr "Ruter for:"
@@ -26433,5 +26628,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2253 build/trans_presets.java:2276
+#: build/trans_presets.java:2266 build/trans_presets.java:2289
 msgid "Hiking"
 msgstr "Tursti"
@@ -26440,6 +26635,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2254 build/trans_presets.java:2277
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2267 build/trans_presets.java:2290
+#: build/trans_presets.java:2840
 msgid "Cycling"
 msgstr "Sykling"
@@ -26447,5 +26642,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2255 build/trans_presets.java:2278
+#: build/trans_presets.java:2268 build/trans_presets.java:2291
 msgid "Mountainbiking"
 msgstr "Fjellsykling"
@@ -26454,6 +26649,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2256 build/trans_presets.java:2279
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2269 build/trans_presets.java:2292
+#: build/trans_presets.java:2888
 msgid "Skiing"
 msgstr "Ski"
@@ -26461,5 +26656,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2257 build/trans_presets.java:2280
+#: build/trans_presets.java:2270 build/trans_presets.java:2293
 msgid "Riding"
 msgstr "Riding"
@@ -26467,50 +26662,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2258 build/trans_presets.java:2281
+#: build/trans_presets.java:2271 build/trans_presets.java:2294
 msgid "... other transportation modes possible"
 msgstr "… andre typer transport mulig"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2273
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "Board Content"
 msgstr "Tavleinnhold"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "notice"
 msgstr "Merknad"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "history"
 msgstr "Historisk"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "nature"
 msgstr "Natur"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "wildlife"
 msgstr "Dyreliv"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "plants"
 msgstr "Planter"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2281
 msgid "Guidepost"
 msgstr "Veiviser"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2296
 msgid "Information Terminal"
 msgstr "Informasjonsterminal"
@@ -26518,10 +26713,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2288 build/trans_presets.java:2298
+#: build/trans_presets.java:2301 build/trans_presets.java:2311
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2306
 msgid "Audioguide"
 msgstr "Lydomviser"
@@ -26529,25 +26724,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2316
 msgid "Audioguide via mobile phone?"
 msgstr "Lydomvisning via mobiltelefon"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2317
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2319
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. group "Leisure"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2326
 msgid "Leisure"
 msgstr "Fritid"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2327
 msgid "Cinema"
 msgstr "Kino"
@@ -26556,10 +26751,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2330
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2334
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -26568,10 +26763,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2337
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2343
 msgid "Dog Park"
 msgstr ""
@@ -26580,45 +26775,45 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park" />
 #. item "Leisure/Dog Park" label "Edit Dog Park"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2346
 msgid "Edit Dog Park"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "Barrier"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "fence"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "wall"
 msgstr ""
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2354
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2355
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2360
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2361
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2365
 msgid "Sauna"
 msgstr ""
@@ -26628,5 +26823,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2353 build/trans_presets.java:2356
+#: build/trans_presets.java:2366 build/trans_presets.java:2369
 msgid "Edit Sauna"
 msgstr ""
@@ -26654,20 +26849,20 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:2361 build/trans_presets.java:2472
-#: build/trans_presets.java:2593 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3453
-#: build/trans_presets.java:3462 build/trans_presets.java:3499
-#: build/trans_presets.java:3548 build/trans_presets.java:3571
-#: build/trans_presets.java:3580 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3712
-#: build/trans_presets.java:3728 build/trans_presets.java:3737
-#: build/trans_presets.java:3746 build/trans_presets.java:3762
-#: build/trans_presets.java:3784 build/trans_presets.java:3799
+#: build/trans_presets.java:2374 build/trans_presets.java:2485
+#: build/trans_presets.java:2606 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3466
+#: build/trans_presets.java:3475 build/trans_presets.java:3512
+#: build/trans_presets.java:3561 build/trans_presets.java:3584
+#: build/trans_presets.java:3593 build/trans_presets.java:3640
+#: build/trans_presets.java:3649 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3725
+#: build/trans_presets.java:3741 build/trans_presets.java:3750
+#: build/trans_presets.java:3759 build/trans_presets.java:3775
+#: build/trans_presets.java:3797 build/trans_presets.java:3812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2375
 msgid "Access"
 msgstr "Adkomst"
@@ -26675,5 +26870,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2378
 msgid "Playground"
 msgstr "Lekeplass"
@@ -26681,15 +26876,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2380
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2384
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2385
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
@@ -26697,10 +26892,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2375 build/trans_presets.java:2702
+#: build/trans_presets.java:2388 build/trans_presets.java:2715
 msgid "Fireplace"
 msgstr "Bålplass"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2390
 msgid "Public Grill"
 msgstr ""
@@ -26708,15 +26903,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2392
 msgid "Edit Public Grill"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2396
 msgid "Covered"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgctxt "grill"
 msgid "Fuel"
@@ -26724,30 +26919,30 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgid "charcoal"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgid "electric"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2399
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2400
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. group "Culture"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2405
 msgid "Culture"
 msgstr ""
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2406
 msgid "Museum"
 msgstr "Museum"
@@ -26755,10 +26950,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2408
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2414
 msgid "Theatre"
 msgstr "Teater"
@@ -26767,10 +26962,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2417
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2421
 msgid "Library"
 msgstr "Bibliotek"
@@ -26779,10 +26974,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2424
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2429
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -26790,10 +26985,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2431
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2435
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -26801,10 +26996,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2437
 msgid "Edit Artwork"
 msgstr "Rediger kunstverk"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2441
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -26814,5 +27009,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:2432
+#: build/trans_presets.java:2445
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -26821,6 +27016,6 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "Religion"
 msgstr "Religion"
@@ -26829,6 +27024,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "bahai"
 msgstr "bahai"
@@ -26837,6 +27032,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "buddhist"
 msgstr "buddhist"
@@ -26845,6 +27040,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "christian"
 msgstr "kristen"
@@ -26853,6 +27048,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "hindu"
 msgstr "hindu"
@@ -26861,6 +27056,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "jain"
 msgstr "jain"
@@ -26869,6 +27064,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "jewish"
 msgstr "jødisk"
@@ -26877,6 +27072,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "muslim"
 msgstr "muslim"
@@ -26885,6 +27080,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "sikh"
 msgstr "sikh"
@@ -26893,6 +27088,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "spiritualist"
 msgstr "spiritualist"
@@ -26901,6 +27096,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "taoist"
 msgstr "taoist"
@@ -26909,6 +27104,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "unitarian"
 msgstr "unitarisk"
@@ -26917,6 +27112,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "zoroastrian"
 msgstr "zoroastrisk"
@@ -26925,6 +27120,6 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -26933,6 +27128,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "anglican"
 msgstr "anglikansk"
@@ -26941,6 +27136,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "baptist"
 msgstr "baptist"
@@ -26949,6 +27144,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "catholic"
 msgstr "katolsk"
@@ -26957,6 +27152,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "evangelical"
 msgstr "evangelisk"
@@ -26965,6 +27160,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
@@ -26973,6 +27168,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "lutheran"
 msgstr "luthersk"
@@ -26981,6 +27176,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "methodist"
 msgstr "metodist"
@@ -26989,6 +27184,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "mormon"
 msgstr "mormoner"
@@ -26997,6 +27192,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "orthodox"
 msgstr "ortodoks"
@@ -27005,6 +27200,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
@@ -27013,6 +27208,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "presbyterian"
 msgstr "presbyteriansk"
@@ -27021,6 +27216,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "protestant"
 msgstr "protestant"
@@ -27029,6 +27224,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "quaker"
 msgstr "quaker"
@@ -27037,6 +27232,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "shia"
 msgstr "shia"
@@ -27045,38 +27240,36 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "sunni"
 msgstr "sunni"
 
 #. item "Culture/Place of Worship" combo "Service Times"
-#: build/trans_presets.java:2437
-#, fuzzy
+#: build/trans_presets.java:2450
 msgid "Service Times"
-msgstr "Service"
+msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 10:00"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 10:30"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 11:00"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Opening Hours for visiting"
-#: build/trans_presets.java:2438
-#, fuzzy
+#: build/trans_presets.java:2451
 msgid "Opening Hours for visiting"
-msgstr "Åpningstider"
+msgstr ""
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2453
 msgid "Recording Studio"
 msgstr ""
@@ -27084,15 +27277,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2455
 msgid "Edit Studio"
 msgstr ""
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2460
 msgid "audio"
 msgstr ""
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2460
 msgid "video"
 msgstr ""
@@ -27100,5 +27293,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2452 build/trans_presets.java:2453
+#: build/trans_presets.java:2465 build/trans_presets.java:2466
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -27106,10 +27299,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:2455
+#: build/trans_presets.java:2468
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2472
 msgid "Town hall"
 msgstr "Rådhus"
@@ -27117,5 +27310,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2474
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
@@ -27124,10 +27317,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2465 build/trans_presets.java:2467
+#: build/trans_presets.java:2478 build/trans_presets.java:2480
 msgid "Community Centre"
 msgstr ""
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2487
 msgid "Embassy"
 msgstr "Ambassade"
@@ -27135,10 +27328,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2489
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2493
 msgid "Courthouse"
 msgstr "Domstol"
@@ -27147,10 +27340,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2496
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2500
 msgid "Prison"
 msgstr "Fengsel"
@@ -27159,10 +27352,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2503
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2507
 msgid "Police"
 msgstr "Politi"
@@ -27172,10 +27365,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2511
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2515
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -27184,10 +27377,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:2505
+#: build/trans_presets.java:2518
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2522
 msgid "Post Office"
 msgstr "Postkontor"
@@ -27195,25 +27388,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:2511
+#: build/trans_presets.java:2524
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
 
 #. group "Education"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2530
 msgid "Education"
 msgstr ""
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2531
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2532
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Education/School"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2536
 msgid "School"
 msgstr "Skole"
@@ -27221,10 +27414,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2538
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Education/University"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2542
 msgid "University"
 msgstr "Universitet"
@@ -27232,10 +27425,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2544
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Education/College"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2548
 msgid "College"
 msgstr "Høyskole"
@@ -27243,10 +27436,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2550
 msgid "Edit College"
 msgstr "Rediger høyskole"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2554
 msgid "Driving School"
 msgstr ""
@@ -27254,20 +27447,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2556
 msgid "Edit Driving School"
 msgstr ""
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2561
 msgid "License Classes"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2564
 msgid "Health"
 msgstr "Helse"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2565
 msgid "Hospital"
 msgstr "Sykehus"
@@ -27275,10 +27468,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2567
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2571
 msgid "Doctors"
 msgstr "Lege"
@@ -27286,33 +27479,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2573
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2578
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2579
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
 #. item "Health/Nursing Home"
-#: build/trans_presets.java:2571
-#, fuzzy
+#: build/trans_presets.java:2584
 msgid "Nursing Home"
-msgstr "Nummereringsmåte"
+msgstr ""
 
 #. item "Health/Nursing Home" label "Edit Nursing Home"
-#: build/trans_presets.java:2572
-#, fuzzy
+#: build/trans_presets.java:2585
 msgid "Edit Nursing Home"
-msgstr "Rediger fotgjengerfelt"
+msgstr ""
 
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2591
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -27320,5 +27511,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2593
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -27326,10 +27517,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2595
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2599
 msgid "Hearing Aids"
 msgstr ""
@@ -27337,5 +27528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2601
 msgid "Edit Hearing Aids"
 msgstr ""
@@ -27343,5 +27534,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2609
 msgid "Baby Hatch"
 msgstr "Babyboks"
@@ -27349,5 +27540,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2611
 msgid "Edit Baby Hatch"
 msgstr "Rediger babyboks"
@@ -27355,5 +27546,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2617
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -27362,5 +27553,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:2607
+#: build/trans_presets.java:2620
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -27369,15 +27560,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2623
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2624
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2627
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -27386,5 +27577,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2631
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -27393,10 +27584,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2634
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2648
 msgid "limited"
 msgstr "begrenset"
@@ -27404,15 +27595,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2636 build/trans_presets.java:3809
+#: build/trans_presets.java:2649 build/trans_presets.java:3822
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2651
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2656
 msgid "Telephone"
 msgstr "Telefon"
@@ -27421,15 +27612,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2659
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2667
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2669
 msgid "Clock"
 msgstr ""
@@ -27438,5 +27629,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2672
 msgid "Edit Clock"
 msgstr ""
@@ -27446,5 +27637,5 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgid "Display"
 msgstr ""
@@ -27452,89 +27643,85 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgctxt "display"
 msgid "analog"
-msgstr "Kanal"
+msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgctxt "display"
 msgid "digital"
-msgstr "Rediger sykehus"
+msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2662
-#, fuzzy
+#: build/trans_presets.java:2675
 msgctxt "display"
 msgid "sundial"
-msgstr "indisk"
+msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2662
-#, fuzzy
+#: build/trans_presets.java:2675
 msgctxt "display"
 msgid "unorthodox"
-msgstr "ortodoks"
+msgstr ""
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "Support"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "pole"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "wall_mounted"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "billboard"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "Visibility/readability"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(up to 5m)"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(up to 20m)"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(more than 20m)"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2678
 msgid "Shows current date"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2679
 msgid "Shows temperature"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2680
 msgid "Shows barometric pressure"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2681
 msgid "Shows humidity"
 msgstr ""
@@ -27542,5 +27729,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2684
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -27549,5 +27736,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2687
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -27555,40 +27742,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2689
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2690
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2692
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2693
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2694
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2695
 msgid "container"
 msgstr ""
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2695
 msgid "centre"
 msgstr ""
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2697
 msgid "Waste Basket"
 msgstr "Søppeldunk"
@@ -27596,5 +27783,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2699
 msgid "Edit Waste Basket"
 msgstr "Rediger søppeldunk"
@@ -27603,30 +27790,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2706
 msgid "Backrest"
 msgstr "Ryggstø"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "Material"
 msgstr "Material"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "stone"
 msgstr "stein"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "plastic"
 msgstr "plast"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgid "Colour"
 msgstr "Farge"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "black"
@@ -27634,5 +27821,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "brown"
@@ -27640,5 +27827,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "green"
@@ -27646,5 +27833,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "red"
@@ -27652,5 +27839,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "blue"
@@ -27658,5 +27845,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "gray"
@@ -27664,5 +27851,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "white"
@@ -27670,20 +27857,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2709
 msgid "Amount of Seats"
 msgstr "Antall seter"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2712
 msgid "Edit Shelter"
 msgstr "Rediger ly"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgid "Type of shelter"
 msgstr ""
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "weather_shelter"
@@ -27691,5 +27878,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "public_transport"
@@ -27697,5 +27884,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -27703,5 +27890,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "wildlife_hide"
@@ -27709,10 +27896,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2718
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2719
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -27721,10 +27908,10 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2708 build/trans_presets.java:4000
+#: build/trans_presets.java:2721 build/trans_presets.java:4013
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
@@ -27732,20 +27919,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 msgid "half"
 msgstr "halv"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 msgid "full"
 msgstr "full"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2723
 msgid "Hide"
 msgstr "Skjul"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2724
 msgid "Lock"
 msgstr "Lås"
@@ -27753,5 +27940,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2727
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -27760,10 +27947,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:2717
+#: build/trans_presets.java:2730
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2734
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -27772,5 +27959,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2737
 msgid "Edit Fire Hydrant"
 msgstr "Rediger hydrant"
@@ -27778,5 +27965,5 @@
 #. item "Facilities/Fire Hydrant" combo "Type" display value
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2726 build/trans_presets.java:3124
+#: build/trans_presets.java:2739 build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "underground"
@@ -27784,5 +27971,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "pillar"
@@ -27790,5 +27977,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "wall"
@@ -27796,5 +27983,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "pond"
@@ -27802,10 +27989,10 @@
 
 #. item "Facilities/Fire Hydrant" combo "Diameter"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2740
 msgid "Diameter"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "lane"
@@ -27813,5 +28000,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "parking_lot"
@@ -27819,5 +28006,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -27825,5 +28012,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "green"
@@ -27831,20 +28018,20 @@
 
 #. item "Facilities/Fire Hydrant" combo "Pressure"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "Pressure"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "xx l/min"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "suction"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2748
 msgid "Count"
 msgstr ""
@@ -27852,20 +28039,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2739 build/trans_presets.java:3514
+#: build/trans_presets.java:2752 build/trans_presets.java:3527
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2753
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2754
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2755
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -27879,6 +28066,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2746 build/trans_presets.java:2755
-#: build/trans_presets.java:2764 build/trans_presets.java:2773
+#: build/trans_presets.java:2759 build/trans_presets.java:2768
+#: build/trans_presets.java:2777 build/trans_presets.java:2786
 msgid "select sport:"
 msgstr "velg sport:"
@@ -28224,6 +28411,6 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 #: build/trans_style.java:3107 build/trans_style.java:3113
 #: build/trans_style.java:3119 build/trans_style.java:3125
@@ -28261,6 +28448,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "multi"
 msgstr "flerbruk"
@@ -28270,6 +28457,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "archery"
 msgstr "bueskyting"
@@ -28279,6 +28466,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "athletics"
 msgstr "turn"
@@ -28288,6 +28475,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "american_football"
 msgstr ""
@@ -28297,6 +28484,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "australian_football"
 msgstr "australsk fotball"
@@ -28306,6 +28493,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "baseball"
 msgstr "baseball"
@@ -28315,6 +28502,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "basketball"
 msgstr "basketball"
@@ -28324,6 +28511,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "boules"
 msgstr "boules"
@@ -28333,6 +28520,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "bowls"
 msgstr "bowls"
@@ -28342,6 +28529,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "canadian_football"
 msgstr ""
@@ -28351,6 +28538,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "canoe"
 msgstr "kano"
@@ -28360,6 +28547,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "climbing"
 msgstr "klatring"
@@ -28369,6 +28556,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cricket"
 msgstr "cricket"
@@ -28378,6 +28565,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cricket_nets"
 msgstr "cricketnett"
@@ -28387,6 +28574,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "croquet"
 msgstr "krocket"
@@ -28396,6 +28583,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cycling"
 msgstr "sykling"
@@ -28405,6 +28592,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "dog_racing"
 msgstr "hundeløp"
@@ -28414,6 +28601,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "equestrian"
 msgstr "ridning"
@@ -28423,6 +28610,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "gaelic_football"
 msgstr ""
@@ -28432,6 +28619,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "golf"
 msgstr "golf"
@@ -28441,6 +28628,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "gymnastics"
 msgstr "gymnastikk"
@@ -28450,6 +28637,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "hockey"
 msgstr "ishockey"
@@ -28459,6 +28646,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "horse_racing"
 msgstr "hesteløp"
@@ -28468,6 +28655,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "motor"
 msgstr "motorsport"
@@ -28477,6 +28664,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "pelota"
 msgstr "pelota"
@@ -28486,6 +28673,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "racquet"
 msgstr "racquet"
@@ -28495,6 +28682,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "rugby_league"
 msgstr ""
@@ -28504,6 +28691,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "rugby_union"
 msgstr ""
@@ -28513,6 +28700,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "shooting"
 msgstr "skyting"
@@ -28522,6 +28709,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skateboard"
 msgstr "skateboard"
@@ -28531,6 +28718,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skating"
 msgstr "skøyter"
@@ -28540,6 +28727,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skiing"
 msgstr "ski"
@@ -28549,6 +28736,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "soccer"
 msgstr "fotball"
@@ -28558,6 +28745,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "swimming"
 msgstr "svømming"
@@ -28567,6 +28754,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "table_tennis"
 msgstr "bordtennis"
@@ -28576,71 +28763,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "tennis"
 msgstr "tennis"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2763
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2764
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2772
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2773
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2781
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2782
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2790
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2791
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2796
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2797
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
 #. group "Sport"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2803
 msgid "Sport"
 msgstr "Sport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2804
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2805
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -28688,25 +28875,25 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "type"
 msgstr "type"
@@ -28756,26 +28943,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "pitch"
 msgstr "bane"
@@ -28825,26 +29012,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "sports_centre"
 msgstr "sportssenter"
@@ -28889,215 +29076,149 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050
 msgid "stadium"
 msgstr "stadion"
 
-#. item "Sport/Multi" combo "type" display value
-#. item "Sport/10pin" combo "type" display value
-#. item "Sport/Athletics" combo "type" display value
-#. item "Sport/Archery" combo "type" display value
-#. item "Sport/Climbing" combo "type" display value
-#. item "Sport/Canoeing" combo "type" display value
-#. item "Sport/Cycling" combo "type" display value
-#. item "Sport/Dog Racing" combo "type" display value
-#. item "Sport/Equestrian" combo "type" display value
-#. item "Sport/Horse Racing" combo "type" display value
-#. item "Sport/Gymnastics" combo "type" display value
-#. item "Sport/Skating" combo "type" display value
-#. item "Sport/Skateboard" combo "type" display value
-#. item "Sport/Swimming" combo "type" display value
-#. item "Sport/Skiing" combo "type" display value
-#. item "Sport/Shooting" combo "type" display value
-#. item "Sport (Ball)/Soccer" combo "type" display value
-#. item "Sport (Ball)/Australian Football" combo "type" display value
-#. item "Sport (Ball)/American Football" combo "type" display value
-#. item "Sport (Ball)/Canadian Football" combo "type" display value
-#. item "Sport (Ball)/Gaelic Football" combo "type" display value
-#. item "Sport (Ball)/Rugby League" combo "type" display value
-#. item "Sport (Ball)/Rugby Union" combo "type" display value
-#. item "Sport (Ball)/Baseball" combo "type" display value
-#. item "Sport (Ball)/Basketball" combo "type" display value
-#. item "Sport (Ball)/Golf" combo "type" display value
-#. item "Sport (Ball)/Boule" combo "type" display value
-#. item "Sport (Ball)/Bowls" combo "type" display value
-#. item "Sport (Ball)/Cricket" combo "type" display value
-#. item "Sport (Ball)/Cricket Nets" combo "type" display value
-#. item "Sport (Ball)/Croquet" combo "type" display value
-#. item "Sport (Ball)/Hockey" combo "type" display value
-#. item "Sport (Ball)/Pelota" combo "type" display value
-#. item "Sport (Ball)/Racquet" combo "type" display value
-#. item "Sport (Ball)/Table Tennis" combo "type" display value
-#. item "Sport (Ball)/Tennis" combo "type" display value
-#. item "Motorsport/Motorsport" combo "type" display value
-#. item "Motorsport/Karting" combo "type" display value
-#. item "Motorsport/Motocross" combo "type" display value
-#. item "Motorsport/Safety Training" combo "type" display value
-#. item "Motorsport/Model Aerodrome" combo "type" display value
-#. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
-#: build/trans_presets.java:3062 build/trans_presets.java:3068
-msgid "track"
-msgstr ""
-
 #. item "Sport/10pin"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2810
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2811
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2816
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2817
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2822
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2823
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2828
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2829
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2834
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2835
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2841
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2846
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2847
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2852
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2853
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2858
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2859
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2864
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2865
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2870
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2871
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2876
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2877
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2882
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2883
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -29105,60 +29226,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2890
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "downhill"
 msgstr "slalom"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "nordic"
 msgstr "langrenn"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "snow_park"
 msgstr "snøpark"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "novice"
 msgstr "begynner"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "easy"
 msgstr "enkel"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "advanced"
 msgstr "vanskelig"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "expert"
 msgstr "ekspert"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "freeride"
 msgstr "fristil"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2897
 msgid "Shooting"
 msgstr "Skyting"
@@ -29166,105 +29287,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2899
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2905
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2906
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2907
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2912
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2913
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2918
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2919
 msgid "Edit American Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2924
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2925
 msgid "Edit Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2930
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2931
 msgid "Edit Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2936
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2937
 msgid "Edit Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2942
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2943
 msgid "Edit Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2948
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2949
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2954
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2955
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2960
 msgid "Volleyball"
 msgstr ""
@@ -29272,10 +29393,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2962
 msgid "Edit Volleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2969
 msgid "Beachvolleyball"
 msgstr ""
@@ -29283,120 +29404,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2971
 msgid "Edit Beachvolleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2978
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2979
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2982
 msgid "golf_course"
 msgstr "golfbane"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2984
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2985
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2990
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2991
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2996
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2997
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3002
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3003
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3008
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3009
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3014
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3015
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3020
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3021
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3026
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3027
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3032
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3033
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3038
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3039
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
@@ -29404,40 +29525,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:3032 build/trans_presets.java:3033
+#: build/trans_presets.java:3045 build/trans_presets.java:3046
 msgid "Motorsport"
 msgstr ""
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3047
 msgid "Edit Motorsport"
 msgstr ""
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3052
 msgid "Karting"
 msgstr ""
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3053
 msgid "Edit Karting"
 msgstr ""
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3058
 msgid "Motocross"
 msgstr ""
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3059
 msgid "Edit Motocross"
 msgstr ""
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3064
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3065
 msgid "Edit Safety Training"
 msgstr ""
@@ -29445,20 +29566,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3071
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3072
 msgid "Edit Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3077
 msgid "RC Car"
 msgstr ""
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3078
 msgid "Edit RC Car"
 msgstr ""
@@ -29466,10 +29587,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:3072 build/trans_presets.java:3073
+#: build/trans_presets.java:3085 build/trans_presets.java:3086
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3087
 msgid "Building"
 msgstr "Bygning"
@@ -29477,25 +29598,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3090
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3091
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "communication"
 msgstr ""
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "observation"
 msgstr ""
@@ -29504,5 +29625,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:3083 build/trans_presets.java:3104
+#: build/trans_presets.java:3096 build/trans_presets.java:3117
 msgid "Height (meters)"
 msgstr "Høyde (meter)"
@@ -29510,5 +29631,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3100
 msgid "Flagpole"
 msgstr ""
@@ -29518,15 +29639,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3105
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3106
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3110
 msgid "Chimney"
 msgstr ""
@@ -29534,10 +29655,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3112
 msgid "Edit Chimney"
 msgstr ""
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3119
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -29545,20 +29666,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:3108
+#: build/trans_presets.java:3121
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3125
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3126
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3130
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -29567,5 +29688,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:3120
+#: build/trans_presets.java:3133
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
@@ -29609,5 +29730,5 @@
 #. <icon src="misc/coastline.png"/>
 #. color water
-#: build/trans_presets.java:3123 build/trans_style.java:817
+#: build/trans_presets.java:3136 build/trans_style.java:817
 #: build/trans_style.java:830 build/trans_style.java:842
 #: build/trans_style.java:847 build/trans_style.java:2936
@@ -29620,10 +29741,10 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3123 build/trans_presets.java:3250
+#: build/trans_presets.java:3136 build/trans_presets.java:3263
 msgid "gas"
 msgstr "gass"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:3136
 msgid "heat"
 msgstr ""
@@ -29631,20 +29752,20 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3123 build/trans_presets.java:3250
+#: build/trans_presets.java:3136 build/trans_presets.java:3263
 msgid "oil"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:3136
 msgid "sewage"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgid "Location"
 msgstr "Område"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "underwater"
@@ -29652,5 +29773,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "overground"
@@ -29658,5 +29779,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3139
 msgid "Crane"
 msgstr "Kran"
@@ -29664,10 +29785,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:3128
+#: build/trans_presets.java:3141
 msgid "Edit Crane"
 msgstr "Rediger kran"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3145
 msgid "Mineshaft"
 msgstr ""
@@ -29676,25 +29797,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:3135
+#: build/trans_presets.java:3148
 msgid "Edit Mineshaft"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "Function"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "winding"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "air"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3152
 msgid "Depth in meters"
 msgstr ""
@@ -29702,5 +29823,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "Resource"
 msgstr ""
@@ -29708,5 +29829,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "aggregate"
 msgstr ""
@@ -29714,5 +29835,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "bauxite"
 msgstr ""
@@ -29721,6 +29842,6 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3263
 msgid "coal"
 msgstr "kull"
@@ -29728,5 +29849,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "copper"
 msgstr ""
@@ -29734,5 +29855,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "dimension_stone"
 msgstr ""
@@ -29740,5 +29861,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "gold"
 msgstr ""
@@ -29746,5 +29867,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "ilmenite"
 msgstr ""
@@ -29752,5 +29873,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "iron_ore"
 msgstr ""
@@ -29758,5 +29879,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "lead"
 msgstr ""
@@ -29764,5 +29885,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "limestone"
 msgstr ""
@@ -29770,5 +29891,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "nickel"
 msgstr ""
@@ -29776,5 +29897,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "rutile"
 msgstr ""
@@ -29782,5 +29903,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "salt"
 msgstr ""
@@ -29788,5 +29909,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "silver"
 msgstr ""
@@ -29794,5 +29915,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "tin"
 msgstr ""
@@ -29800,5 +29921,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "zinc"
 msgstr ""
@@ -29806,10 +29927,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:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "zircon"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3155
 msgid "Visible Headframe"
 msgstr ""
@@ -29817,10 +29938,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:3143 build/trans_presets.java:3153
+#: build/trans_presets.java:3156 build/trans_presets.java:3166
 msgid "Disused"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3158
 msgid "Adit"
 msgstr ""
@@ -29828,10 +29949,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:3147
+#: build/trans_presets.java:3160
 msgid "Edit Adit"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3163
 msgid "Length in meters"
 msgstr ""
@@ -29839,15 +29960,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3169
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3170
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3174
 msgid "Water Works"
 msgstr ""
@@ -29855,10 +29976,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:3163
+#: build/trans_presets.java:3176
 msgid "Edit Water Works"
 msgstr ""
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3182
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -29868,10 +29989,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:3173
+#: build/trans_presets.java:3186
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3190
 msgid "Watermill"
 msgstr ""
@@ -29879,10 +30000,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:3179
+#: build/trans_presets.java:3192
 msgid "Edit Watermill"
 msgstr ""
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3197
 msgid "Fountain"
 msgstr "Fontene"
@@ -29891,10 +30012,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:3187
+#: build/trans_presets.java:3200
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3204
 msgid "Water Well"
 msgstr ""
@@ -29902,5 +30023,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:3193
+#: build/trans_presets.java:3206
 msgid "Edit Water Well"
 msgstr ""
@@ -29908,5 +30029,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3211
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -29914,5 +30035,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:3200
+#: build/trans_presets.java:3213
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
@@ -29920,10 +30041,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:3206
+#: build/trans_presets.java:3219
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3210
+#: build/trans_presets.java:3223
 msgid "Street Lamp"
 msgstr ""
@@ -29931,5 +30052,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:3212
+#: build/trans_presets.java:3225
 msgid "Edit Street Lamp"
 msgstr ""
@@ -29938,15 +30059,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3228
 msgid "Operation times"
 msgstr ""
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3228
 msgid "Mo-Fr 22:00-05:00"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3217
+#: build/trans_presets.java:3230
 msgid "Measurement Station"
 msgstr ""
@@ -29954,62 +30075,61 @@
 #. <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:3219
+#: build/trans_presets.java:3232
 msgid "Edit Measurement Station"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "Measurement"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "particulate_matter"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "seismic"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "water_level"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "weather"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "Recording"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "manually"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "automated"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "remote"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:3239
 msgctxt "display"
 msgid "no"
-msgstr "nei"
+msgstr ""
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3241
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -30017,10 +30137,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:3230
+#: build/trans_presets.java:3243
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3247
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -30028,30 +30148,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:3236
+#: build/trans_presets.java:3249
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "indoor"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "outdoor"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "public"
 msgstr ""
 
 #. group "Power"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3255
 msgid "Power"
 msgstr ""
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3256
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -30061,146 +30181,140 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3260
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biofuel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biogas"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biomass"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "diesel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "gasoline"
-msgstr "Kystlinje"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "geothermal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "hydro"
 msgstr "vann"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "nuclear"
 msgstr "atom"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "osmotic"
-msgstr "Merknad"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "solar"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "tidal"
-msgstr "Tidevannsflate"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "waste"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "wave"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "wind"
 msgstr "vind"
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "Method"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "anaerobic_digestion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "combustion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "dam"
-msgstr "Demning"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "fission"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "fusion"
-msgstr "Versjon"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "gasification"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "photovoltaic"
 msgstr "solcelle"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "pumped-storage"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "pumping"
-msgstr "Camping"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "pyrolysis"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "run-of-the-river"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "thermal"
 msgstr ""
@@ -30208,13 +30322,12 @@
 #. <space />
 #. item "Power/Power Generator" label "Output forms of energy"
-#: build/trans_presets.java:3253
+#: build/trans_presets.java:3266
 msgid "Output forms of energy"
 msgstr ""
 
 #. item "Power/Power Generator" combo "electricity"
-#: build/trans_presets.java:3254
-#, fuzzy
+#: build/trans_presets.java:3267
 msgid "electricity"
-msgstr "Elektronikk"
+msgstr ""
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30227,9 +30340,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "2 W"
 msgstr ""
@@ -30244,9 +30357,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "3 kW"
 msgstr ""
@@ -30261,9 +30374,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "5 MW"
 msgstr ""
@@ -30278,56 +30391,54 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "7 GW"
 msgstr ""
 
 #. item "Power/Power Generator" combo "hot water"
-#: build/trans_presets.java:3255
-#, fuzzy
+#: build/trans_presets.java:3268
 msgid "hot water"
-msgstr "vann"
+msgstr ""
 
 #. item "Power/Power Generator" combo "hot air"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3269
 msgid "hot air"
 msgstr ""
 
 #. item "Power/Power Generator" combo "cold water"
-#: build/trans_presets.java:3257
-#, fuzzy
+#: build/trans_presets.java:3270
 msgid "cold water"
-msgstr "vann"
+msgstr ""
 
 #. item "Power/Power Generator" combo "cold air"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3271
 msgid "cold air"
 msgstr ""
 
 #. item "Power/Power Generator" combo "compressed air"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3272
 msgid "compressed air"
 msgstr ""
 
 #. item "Power/Power Generator" combo "steam"
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3273
 msgid "steam"
 msgstr ""
 
 #. item "Power/Power Generator" combo "vacuum"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3274
 msgid "vacuum"
 msgstr ""
 
 #. item "Power/Power Generator" combo "battery charging"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3275
 msgid "battery charging"
 msgstr ""
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3277
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -30336,10 +30447,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:3280
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3286
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -30348,5 +30459,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:3276
+#: build/trans_presets.java:3289
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -30354,10 +30465,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3279 build/trans_presets.java:3312
+#: build/trans_presets.java:3292 build/trans_presets.java:3325
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3294
 msgid "Cable Distribution Cabinet"
 msgstr ""
@@ -30366,5 +30477,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:3284
+#: build/trans_presets.java:3297
 msgid "Edit Cable Distribution Cabinet"
 msgstr ""
@@ -30372,5 +30483,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3290
+#: build/trans_presets.java:3303
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -30381,5 +30492,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3295
+#: build/trans_presets.java:3308
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
@@ -30387,10 +30498,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3310
 msgid "Tower reference"
 msgstr ""
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3312
 msgid "Pole"
 msgstr ""
@@ -30399,5 +30510,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3302
+#: build/trans_presets.java:3315
 msgid "Edit Power Pole"
 msgstr ""
@@ -30405,10 +30516,10 @@
 #. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3304
+#: build/trans_presets.java:3317
 msgid "Pole reference"
 msgstr ""
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3319
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -30417,15 +30528,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3309
+#: build/trans_presets.java:3322
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgid "Line type"
 msgstr ""
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgctxt "Power Line"
 msgid "line"
@@ -30433,5 +30544,5 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgctxt "Power Line"
 msgid "minor_line"
@@ -30439,40 +30550,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3328
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 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:3316
+#: build/trans_presets.java:3329
 msgid "single"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "double"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "triple"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "quad"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3332
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3320
+#: build/trans_presets.java:3333
 msgid "Castle"
 msgstr "Slott"
@@ -30481,20 +30592,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3336
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3341
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3342
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3347
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -30503,10 +30614,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:3337
+#: build/trans_presets.java:3350
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3355
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -30514,10 +30625,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3344
+#: build/trans_presets.java:3357
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3361
 msgid "Palaeontological Site"
 msgstr "Paleontologisk sted"
@@ -30525,5 +30636,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3350
+#: build/trans_presets.java:3363
 msgid "Edit Palaeontological Site"
 msgstr "Rediger paleontologisk sted"
@@ -30531,15 +30642,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3368
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3356
+#: build/trans_presets.java:3369
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3373
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -30547,60 +30658,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3362
+#: build/trans_presets.java:3375
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3379
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3380
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3371
+#: build/trans_presets.java:3384
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3385
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3376
+#: build/trans_presets.java:3389
 msgid "Boundary Stone"
 msgstr "Grensestein"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3377
+#: build/trans_presets.java:3390
 msgid "Edit Boundary Stone"
 msgstr "Rediger grensestein"
 
 #. group "Shops"
-#: build/trans_presets.java:3383
+#: build/trans_presets.java:3396
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3397
 msgid "Food"
 msgstr ""
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3398
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3399
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3391
+#: build/trans_presets.java:3404
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -30608,10 +30719,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3406
 msgid "Edit Convenience Store"
 msgstr "Rediger minimarked"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3411
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -30619,5 +30730,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3400
+#: build/trans_presets.java:3413
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
@@ -30625,5 +30736,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3406
+#: build/trans_presets.java:3419
 msgid "Baker"
 msgstr "Baker"
@@ -30631,10 +30742,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3408
+#: build/trans_presets.java:3421
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3413
+#: build/trans_presets.java:3426
 msgid "Butcher"
 msgstr "Slakter"
@@ -30642,10 +30753,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3415
+#: build/trans_presets.java:3428
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3420
+#: build/trans_presets.java:3433
 msgid "Seafood"
 msgstr ""
@@ -30653,10 +30764,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3435
 msgid "Edit Seafood"
 msgstr ""
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3442
 msgid "Deli (Fine Food)"
 msgstr ""
@@ -30664,10 +30775,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:3431
+#: build/trans_presets.java:3444
 msgid "Edit Deli (Fine Food)"
 msgstr ""
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3451
 msgid "Confectionery"
 msgstr ""
@@ -30675,5 +30786,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:3453
 msgid "Edit Confectionery"
 msgstr ""
@@ -30681,5 +30792,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3459
 msgid "Marketplace"
 msgstr ""
@@ -30687,10 +30798,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3448
+#: build/trans_presets.java:3461
 msgid "Edit Marketplace"
 msgstr ""
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3468
 msgid "Greengrocer"
 msgstr ""
@@ -30698,15 +30809,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3457
+#: build/trans_presets.java:3470
 msgid "Edit Greengrocer"
 msgstr ""
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3464
+#: build/trans_presets.java:3477
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3465
+#: build/trans_presets.java:3478
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
@@ -30714,5 +30825,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3471
+#: build/trans_presets.java:3484
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -30720,25 +30831,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:3486
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3491
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3479
+#: build/trans_presets.java:3492
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3487
+#: build/trans_presets.java:3500
 msgid "Edit Clothes Shop"
 msgstr ""
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3505
 msgid "Boutique"
 msgstr ""
@@ -30746,20 +30857,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3494
+#: build/trans_presets.java:3507
 msgid "Edit Boutique"
 msgstr ""
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3501
+#: build/trans_presets.java:3514
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3502
+#: build/trans_presets.java:3515
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3507
+#: build/trans_presets.java:3520
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -30767,10 +30878,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3522
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3528
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
@@ -30778,5 +30889,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3521
+#: build/trans_presets.java:3534
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -30784,10 +30895,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3523
+#: build/trans_presets.java:3536
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3541
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -30795,20 +30906,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3530
+#: build/trans_presets.java:3543
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3535
+#: build/trans_presets.java:3548
 msgid "Tailor"
 msgstr ""
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3536
+#: build/trans_presets.java:3549
 msgid "Edit Tailor"
 msgstr ""
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3554
 msgid "Fabric"
 msgstr ""
@@ -30816,35 +30927,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3543
+#: build/trans_presets.java:3556
 msgid "Edit Fabric"
 msgstr ""
 
 #. group "Electronic"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3564
 msgid "Electronic"
 msgstr ""
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3552
+#: build/trans_presets.java:3565
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3553
+#: build/trans_presets.java:3566
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3558
+#: build/trans_presets.java:3571
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3559
+#: build/trans_presets.java:3572
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3577
 msgid "Mobile Phone"
 msgstr ""
@@ -30852,10 +30963,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3579
 msgid "Edit Mobile Phone"
 msgstr ""
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3573
+#: build/trans_presets.java:3586
 msgid "Vacuum Cleaner"
 msgstr ""
@@ -30863,35 +30974,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3575
+#: build/trans_presets.java:3588
 msgid "Edit Vacuum Cleaner"
 msgstr ""
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3582
+#: build/trans_presets.java:3595
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3583
+#: build/trans_presets.java:3596
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:3601
 msgid "Video"
 msgstr "Video"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3602
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
 #. group "Cash"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3608
 msgid "Cash"
 msgstr "Valuta"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3609
 msgid "Bank"
 msgstr "Bank"
@@ -30899,5 +31010,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3598
+#: build/trans_presets.java:3611
 msgid "Edit Bank"
 msgstr "Rediger bank"
@@ -30905,10 +31016,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3603 build/trans_presets.java:3612
+#: build/trans_presets.java:3616 build/trans_presets.java:3625
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3605
+#: build/trans_presets.java:3618
 msgid "Money Exchange"
 msgstr "Vekslingssted"
@@ -30916,5 +31027,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:3607
+#: build/trans_presets.java:3620
 msgid "Edit Money Exchange"
 msgstr "Rediger vekslingssted"
@@ -30922,10 +31033,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:3614
+#: build/trans_presets.java:3627
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3620
+#: build/trans_presets.java:3633
 msgid "Department Store"
 msgstr ""
@@ -30933,10 +31044,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3622
+#: build/trans_presets.java:3635
 msgid "Edit Department Store"
 msgstr ""
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3629
+#: build/trans_presets.java:3642
 msgid "Mall"
 msgstr ""
@@ -30944,5 +31055,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3631
+#: build/trans_presets.java:3644
 msgid "Edit Mall"
 msgstr ""
@@ -30950,35 +31061,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3639
+#: build/trans_presets.java:3652
 msgid "Chemist"
 msgstr "Hygiene"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3640
+#: build/trans_presets.java:3653
 msgid "Edit Chemist"
 msgstr "Rediger hygiene"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3645
+#: build/trans_presets.java:3658
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3646
+#: build/trans_presets.java:3659
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3651
+#: build/trans_presets.java:3664
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3665
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3657
+#: build/trans_presets.java:3670
 msgid "Jewelry"
 msgstr ""
@@ -30986,10 +31097,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3672
 msgid "Edit Jewelry"
 msgstr ""
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3666
+#: build/trans_presets.java:3679
 msgid "Erotic"
 msgstr ""
@@ -30997,5 +31108,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3681
 msgid "Edit Erotic"
 msgstr ""
@@ -31003,5 +31114,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3689
 msgid "Florist"
 msgstr "Blomster"
@@ -31009,10 +31120,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3678
+#: build/trans_presets.java:3691
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3683
+#: build/trans_presets.java:3696
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -31020,5 +31131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3685
+#: build/trans_presets.java:3698
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
@@ -31026,5 +31137,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3691
+#: build/trans_presets.java:3704
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -31032,10 +31143,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:3693
+#: build/trans_presets.java:3706
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3698
+#: build/trans_presets.java:3711
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -31043,10 +31154,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3700
+#: build/trans_presets.java:3713
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3705
+#: build/trans_presets.java:3718
 msgid "Paint"
 msgstr ""
@@ -31054,5 +31165,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3707
+#: build/trans_presets.java:3720
 msgid "Edit Paint"
 msgstr ""
@@ -31060,15 +31171,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3715
+#: build/trans_presets.java:3728
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3716
+#: build/trans_presets.java:3729
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3721
+#: build/trans_presets.java:3734
 msgid "Kitchen"
 msgstr ""
@@ -31076,10 +31187,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3723
+#: build/trans_presets.java:3736
 msgid "Edit Kitchen"
 msgstr ""
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3730
+#: build/trans_presets.java:3743
 msgid "Curtain"
 msgstr ""
@@ -31087,10 +31198,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3732
+#: build/trans_presets.java:3745
 msgid "Edit Curtain"
 msgstr ""
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3739
+#: build/trans_presets.java:3752
 msgid "Frame"
 msgstr ""
@@ -31098,5 +31209,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3741
+#: build/trans_presets.java:3754
 msgid "Edit Frames"
 msgstr ""
@@ -31104,15 +31215,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3749
+#: build/trans_presets.java:3762
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3750
+#: build/trans_presets.java:3763
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3755
+#: build/trans_presets.java:3768
 msgid "Copyshop"
 msgstr ""
@@ -31120,15 +31231,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3757
+#: build/trans_presets.java:3770
 msgid "Edit Copyshop"
 msgstr ""
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3764
+#: build/trans_presets.java:3777
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3765
+#: build/trans_presets.java:3778
 msgid "Edit Book Store"
 msgstr "Rediger bokhandel"
@@ -31136,15 +31247,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3771
+#: build/trans_presets.java:3784
 msgid "Travel Agency"
 msgstr "Reisebyrå"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3772
+#: build/trans_presets.java:3785
 msgid "Edit Travel Agency"
 msgstr "Rediger reisebyrå"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:3790
 msgid "Musical Instrument"
 msgstr ""
@@ -31152,20 +31263,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3779
+#: build/trans_presets.java:3792
 msgid "Edit Musical Instruments"
 msgstr ""
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3786
+#: build/trans_presets.java:3799
 msgid "Toys"
 msgstr "Leker"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3787
+#: build/trans_presets.java:3800
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3792
+#: build/trans_presets.java:3805
 msgid "Variety Store"
 msgstr ""
@@ -31173,10 +31284,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3794
+#: build/trans_presets.java:3807
 msgid "Edit Variety Store"
 msgstr ""
 
 #. item "Vending machine"
-#: build/trans_presets.java:3802
+#: build/trans_presets.java:3815
 msgid "Vending machine"
 msgstr "Automat"
@@ -31184,5 +31295,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3804
+#: build/trans_presets.java:3817
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -31190,180 +31301,180 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "public_transport_tickets"
 msgstr "billetter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "food"
 msgstr "mat"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "drinks"
 msgstr "drikke"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "sweets"
 msgstr "godter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "cigarettes"
 msgstr "sigaretter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "photos"
 msgstr "fotografier"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "animal_food"
 msgstr "dyremat"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "news_papers"
 msgstr "aviser"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "toys"
 msgstr "leker"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "stamps"
 msgstr "frimerker"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "vouchers"
 msgstr "kuponger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "bicycle_tube"
 msgstr "sykkelslanger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "condoms"
 msgstr "kondomer"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "tampons"
 msgstr "tamponger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. group "Geography"
-#: build/trans_presets.java:3818 build/trans_presets.java:3942
+#: build/trans_presets.java:3831 build/trans_presets.java:3955
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3832
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3820
+#: build/trans_presets.java:3833
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3821
+#: build/trans_presets.java:3834
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3826
+#: build/trans_presets.java:3839
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3827
+#: build/trans_presets.java:3840
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3845
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3846
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:3851
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3852
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3844
+#: build/trans_presets.java:3857
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3858
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. group "Places"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3864
 msgid "Places"
 msgstr "Steder"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3865
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3853
+#: build/trans_presets.java:3866
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3859
+#: build/trans_presets.java:3872
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 msgid "Country"
@@ -31371,10 +31482,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3860
+#: build/trans_presets.java:3873
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Places/State"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3879
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31382,25 +31493,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3867
+#: build/trans_presets.java:3880
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3886
 msgid "Region"
 msgstr "Region"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3887
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Places/County"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3893
 msgid "County"
 msgstr "Kommune"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3881
+#: build/trans_presets.java:3894
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -31408,5 +31519,5 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3888
+#: build/trans_presets.java:3901
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -31415,10 +31526,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3889
+#: build/trans_presets.java:3902
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3895
+#: build/trans_presets.java:3908
 msgid "Town"
 msgstr "By"
@@ -31426,10 +31537,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3897
+#: build/trans_presets.java:3910
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3903
+#: build/trans_presets.java:3916
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -31437,42 +31548,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3905
+#: build/trans_presets.java:3918
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3911
+#: build/trans_presets.java:3924
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3912
+#: build/trans_presets.java:3925
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3918
+#: build/trans_presets.java:3931
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3919
+#: build/trans_presets.java:3932
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
 
 #. item "Places/Isolated Dwelling"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3938
 msgid "Isolated Dwelling"
 msgstr ""
 
 #. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
-#: build/trans_presets.java:3926
-#, fuzzy
+#: build/trans_presets.java:3939
 msgid "Edit Isolated Dwelling"
-msgstr "Rediger minibank"
+msgstr ""
 
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3933
+#: build/trans_presets.java:3946
 msgid "Locality"
 msgstr "Lokalitet"
@@ -31480,10 +31590,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3935
+#: build/trans_presets.java:3948
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3943
+#: build/trans_presets.java:3956
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -31491,10 +31601,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3945
+#: build/trans_presets.java:3958
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:3964
 msgid "Glacier"
 msgstr "Isbre"
@@ -31502,10 +31612,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3953
+#: build/trans_presets.java:3966
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:3972
 msgid "Volcano"
 msgstr "Vulkan"
@@ -31513,10 +31623,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3961
+#: build/trans_presets.java:3974
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3967
+#: build/trans_presets.java:3980
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -31524,5 +31634,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3969
+#: build/trans_presets.java:3982
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
@@ -31530,5 +31640,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3975
+#: build/trans_presets.java:3988
 msgid "Island"
 msgstr "Øy"
@@ -31536,10 +31646,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3977
+#: build/trans_presets.java:3990
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3983
+#: build/trans_presets.java:3996
 msgid "Islet"
 msgstr "Holme"
@@ -31547,15 +31657,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:3998
 msgid "Edit Islet"
 msgstr "Rediger holme"
 
 #. group "Nature"
-#: build/trans_presets.java:3992
+#: build/trans_presets.java:4005
 msgid "Nature"
 msgstr ""
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3993
+#: build/trans_presets.java:4006
 msgid "Tree"
 msgstr "Tre"
@@ -31564,15 +31674,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:4009
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4001
+#: build/trans_presets.java:4014
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4003
+#: build/trans_presets.java:4016
 msgid "Wood"
 msgstr "Skogsområde"
@@ -31581,10 +31691,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4019
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "coniferous"
@@ -31592,5 +31702,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "deciduous"
@@ -31598,5 +31708,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "mixed"
@@ -31604,5 +31714,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4011
+#: build/trans_presets.java:4024
 msgid "Forest"
 msgstr "Skog"
@@ -31611,30 +31721,30 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4027
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "coniferous"
 msgstr "barskog"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "deciduous"
 msgstr "løvskog"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "mixed"
 msgstr "blandingsskog"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4020
+#: build/trans_presets.java:4033
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4021
+#: build/trans_presets.java:4034
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -31642,15 +31752,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4026
+#: build/trans_presets.java:4039
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4027
+#: build/trans_presets.java:4040
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4044
 msgid "Fell"
 msgstr "Fjell"
@@ -31658,20 +31768,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4046
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4037
+#: build/trans_presets.java:4050
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4038
+#: build/trans_presets.java:4051
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4042
+#: build/trans_presets.java:4055
 msgid "Heath"
 msgstr "Beite"
@@ -31679,15 +31789,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4057
 msgid "Edit Heath"
 msgstr "Rediger beite"
 
 #. group "Land use"
-#: build/trans_presets.java:4049
+#: build/trans_presets.java:4062
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4063
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -31696,40 +31806,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:4053
+#: build/trans_presets.java:4066
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4058
+#: build/trans_presets.java:4071
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4059
+#: build/trans_presets.java:4072
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4064
+#: build/trans_presets.java:4077
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4065
+#: build/trans_presets.java:4078
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4070
+#: build/trans_presets.java:4083
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4084
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4076
+#: build/trans_presets.java:4089
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -31737,15 +31847,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:4078
+#: build/trans_presets.java:4091
 msgid "Edit Greenhouse Horticulture"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4097
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4085
+#: build/trans_presets.java:4098
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -31753,25 +31863,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:4104
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4092
+#: build/trans_presets.java:4105
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4096
+#: build/trans_presets.java:4109
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4110
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4102
+#: build/trans_presets.java:4115
 msgid "Village Green"
 msgstr "Friområde"
@@ -31779,10 +31889,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:4104
+#: build/trans_presets.java:4117
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4122
 msgid "Common"
 msgstr "Offentlig"
@@ -31790,20 +31900,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:4111
+#: build/trans_presets.java:4124
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4128
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4116
+#: build/trans_presets.java:4129
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4120
+#: build/trans_presets.java:4133
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -31811,5 +31921,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:4122
+#: build/trans_presets.java:4135
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -31817,15 +31927,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4141
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4142
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4147
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -31833,10 +31943,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:4136
+#: build/trans_presets.java:4149
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4155
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -31844,40 +31954,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:4144
+#: build/trans_presets.java:4157
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4151
+#: build/trans_presets.java:4164
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4152
+#: build/trans_presets.java:4165
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4157
+#: build/trans_presets.java:4170
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4158
+#: build/trans_presets.java:4171
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4163
+#: build/trans_presets.java:4176
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4177
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4169
+#: build/trans_presets.java:4182
 msgid "Garages"
 msgstr ""
@@ -31885,10 +31995,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4184
 msgid "Edit Garages"
 msgstr ""
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4190
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -31896,15 +32006,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4179
+#: build/trans_presets.java:4192
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4184
+#: build/trans_presets.java:4197
 msgid "Military"
 msgstr "Militært"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4185
+#: build/trans_presets.java:4198
 msgid "Edit Military Landuse"
 msgstr "Rediger militært"
@@ -31912,55 +32022,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4191
+#: build/trans_presets.java:4204
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4192
+#: build/trans_presets.java:4205
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4210
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4211
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4203
+#: build/trans_presets.java:4216
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4217
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4209
+#: build/trans_presets.java:4222
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4223
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4215
+#: build/trans_presets.java:4228
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4229
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
 
 #. group "Annotation"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4236
 msgid "Annotation"
 msgstr ""
@@ -31968,5 +32078,5 @@
 #. item "Annotation/Addresses"
 #. Add address nodes
-#: build/trans_presets.java:4224
+#: build/trans_presets.java:4237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
@@ -31977,5 +32087,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:4227
+#: build/trans_presets.java:4240
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -31983,5 +32093,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4242
 msgid "House number"
 msgstr "Husnummer"
@@ -31989,5 +32099,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4231
+#: build/trans_presets.java:4244
 msgid "House name"
 msgstr "Husnavn"
@@ -31996,55 +32106,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4232 build/trans_presets.java:4386
+#: build/trans_presets.java:4245 build/trans_presets.java:4399
 msgid "Street name"
 msgstr "Gatenavn"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4233
+#: build/trans_presets.java:4246
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4234
+#: build/trans_presets.java:4247
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "Country code"
 msgstr "Landskode"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "AT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "CH"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "DE"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "FR"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "GB"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "IT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "US"
 msgstr ""
@@ -32052,5 +32162,5 @@
 #. </optional>
 #. item "Annotation/Address Interpolation"
-#: build/trans_presets.java:4238
+#: build/trans_presets.java:4251
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
@@ -32062,5 +32172,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4241
+#: build/trans_presets.java:4254
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -32068,35 +32178,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "odd"
 msgstr "oddetall"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "even"
 msgstr "partall"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "alphabetic"
 msgstr "alfabetisk"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4245
+#: build/trans_presets.java:4258
 msgid "Contact"
 msgstr ""
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4259
 msgid "Edit Contact information"
 msgstr ""
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4255
+#: build/trans_presets.java:4268
 msgid "Image"
 msgstr "Bilde"
@@ -32106,5 +32216,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4263
+#: build/trans_presets.java:4276
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -32116,5 +32226,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4269 build/trans_presets.java:4286
+#: build/trans_presets.java:4282 build/trans_presets.java:4299
 msgid "outer segment"
 msgstr "ytre linjesegment"
@@ -32122,5 +32232,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4270 build/trans_presets.java:4287
+#: build/trans_presets.java:4283 build/trans_presets.java:4300
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -32128,5 +32238,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4273
+#: build/trans_presets.java:4286
 msgid "Boundary"
 msgstr "Grense"
@@ -32137,5 +32247,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4278
+#: build/trans_presets.java:4291
 msgid "Edit Boundary"
 msgstr "Rediger grense"
@@ -32143,40 +32253,40 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "Boundary type"
 msgstr "Grensetype"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "administrative"
 msgstr "administrativ"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "national"
 msgstr "nasjonal"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "civil"
 msgstr "kommunegrense"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "political"
 msgstr "politisk"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4283
+#: build/trans_presets.java:4296
 msgid "Administrative level"
 msgstr "Administrativt nivå"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4288
+#: build/trans_presets.java:4301
 msgid "Sub area"
 msgstr "Delområde"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4289
+#: build/trans_presets.java:4302
 msgid "Administration centre"
 msgstr "Administrativt senter"
@@ -32184,5 +32294,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4292
+#: build/trans_presets.java:4305
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -32191,5 +32301,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4308
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -32197,40 +32307,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -32239,16 +32349,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4315
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "via node or ways"
-#: build/trans_presets.java:4303
-#, fuzzy
+#: build/trans_presets.java:4316
 msgid "via node or ways"
-msgstr "via node eller linje"
+msgstr ""
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4304
+#: build/trans_presets.java:4317
 msgid "to way"
 msgstr "til linje"
@@ -32256,5 +32365,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4307
+#: build/trans_presets.java:4320
 msgid "Route"
 msgstr "Rute"
@@ -32268,5 +32377,5 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4328
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -32276,5 +32385,5 @@
 #. <key key="type" value="route" />
 #. item "Relations/Directional Route (North America)" combo "Route type"
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "Route type"
 msgstr "Rutetype"
@@ -32282,5 +32391,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32290,5 +32399,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "road"
 msgstr "vei"
@@ -32296,5 +32405,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "ferry"
 msgstr "ferge"
@@ -32302,5 +32411,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "ski"
 msgstr "ski"
@@ -32353,5 +32462,5 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: build/trans_style.java:199 build/trans_style.java:531
 #: build/trans_style.java:537 build/trans_style.java:557
@@ -32363,5 +32472,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "hiking"
 msgstr "tur"
@@ -32369,5 +32478,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32377,5 +32486,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "detour"
 msgstr "omkjøring"
@@ -32389,5 +32498,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: build/trans_style.java:978
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
@@ -32398,5 +32507,5 @@
 #. item "Relations/Route" text "Symbol description"
 #. item "Relations/Directional Route (North America)" text "Symbol description"
-#: build/trans_presets.java:4320 build/trans_presets.java:4350
+#: build/trans_presets.java:4333 build/trans_presets.java:4363
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -32408,6 +32517,6 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4323 build/trans_presets.java:4353
-#: build/trans_presets.java:4375
+#: build/trans_presets.java:4336 build/trans_presets.java:4366
+#: build/trans_presets.java:4388
 msgid "Network"
 msgstr "Nettverk"
@@ -32415,5 +32524,5 @@
 #. item "Relations/Route" combo "Route state"
 #. item "Relations/Directional Route (North America)" combo "Route state"
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "Route state"
 msgstr "Rutetilstand"
@@ -32421,5 +32530,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "proposed"
 msgstr "planlagt"
@@ -32427,5 +32536,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "alternate"
 msgstr "alternativ"
@@ -32433,5 +32542,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "temporary"
 msgstr "midlertidig"
@@ -32439,5 +32548,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "connection"
 msgstr "forbindelse"
@@ -32445,5 +32554,5 @@
 #. item "Relations/Route" text "Color (hex)"
 #. item "Relations/Directional Route (North America)" text "Color (hex)"
-#: build/trans_presets.java:4326 build/trans_presets.java:4356
+#: build/trans_presets.java:4339 build/trans_presets.java:4369
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -32455,15 +32564,15 @@
 #. <roles>
 #. item "Relations/Directional Route (North America)" role "route segment"
-#: build/trans_presets.java:4329 build/trans_presets.java:4359
+#: build/trans_presets.java:4342 build/trans_presets.java:4372
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4330
+#: build/trans_presets.java:4343
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4331
+#: build/trans_presets.java:4344
 msgid "backward segment"
 msgstr "forrige segment"
@@ -32471,5 +32580,5 @@
 #. item "Relations/Route" role "halt point"
 #. item "Relations/Directional Route (North America)" role "halt point"
-#: build/trans_presets.java:4332 build/trans_presets.java:4364
+#: build/trans_presets.java:4345 build/trans_presets.java:4377
 msgid "halt point"
 msgstr "stoppepunkt"
@@ -32477,5 +32586,5 @@
 #. item "Relations/Route" role "forward halt point"
 #. item "Relations/Directional Route (North America)" role "forward halt point"
-#: build/trans_presets.java:4333 build/trans_presets.java:4365
+#: build/trans_presets.java:4346 build/trans_presets.java:4378
 msgid "forward halt point"
 msgstr "neste stoppunkt"
@@ -32483,5 +32592,5 @@
 #. item "Relations/Route" role "backward halt point"
 #. item "Relations/Directional Route (North America)" role "backward halt point"
-#: build/trans_presets.java:4334 build/trans_presets.java:4366
+#: build/trans_presets.java:4347 build/trans_presets.java:4379
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -32489,5 +32598,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4337
+#: build/trans_presets.java:4350
 msgid "Directional Route (North America)"
 msgstr ""
@@ -32501,35 +32610,31 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Directional Route (North America)" label "Edit Directional Route (used in North America)"
-#: build/trans_presets.java:4345
+#: build/trans_presets.java:4358
 msgid "Edit Directional Route (used in North America)"
 msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "east segment"
-#: build/trans_presets.java:4360
-#, fuzzy
+#: build/trans_presets.java:4373
 msgid "east segment"
-msgstr "ytre linjesegment"
+msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "north segment"
-#: build/trans_presets.java:4361
-#, fuzzy
+#: build/trans_presets.java:4374
 msgid "north segment"
-msgstr "ytre linjesegment"
+msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "west segment"
-#: build/trans_presets.java:4362
-#, fuzzy
+#: build/trans_presets.java:4375
 msgid "west segment"
-msgstr "ytre linjesegment"
+msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "south segment"
-#: build/trans_presets.java:4363
-#, fuzzy
+#: build/trans_presets.java:4376
 msgid "south segment"
-msgstr "ytre linjesegment"
+msgstr ""
 
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4369
+#: build/trans_presets.java:4382
 msgid "Route network"
 msgstr ""
@@ -32537,5 +32642,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4371
+#: build/trans_presets.java:4384
 msgid "Edit route network"
 msgstr ""
@@ -32544,5 +32649,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4379
+#: build/trans_presets.java:4392
 msgid "member"
 msgstr ""
@@ -32550,5 +32655,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4395
 msgid "Associated street"
 msgstr ""
@@ -32556,10 +32661,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4384
+#: build/trans_presets.java:4397
 msgid "Edit associated street"
 msgstr ""
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4389
+#: build/trans_presets.java:4402
 msgid "house"
 msgstr ""
@@ -36036,26 +36141,23 @@
 msgstr "fartsgrense er brukt på gangvei"
 
-#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
-#: build/trans_validator.java:70
-msgid "oneway combined with *:backward/forward"
-msgstr ""
-
+#. see #5844, #6760
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *    # oneway combined with *:backward/forward
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:72
+#: build/trans_validator.java:73
 msgid "layer tag with + sign"
 msgstr "navn på lag inneholder +-tegn"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:74
+#: build/trans_validator.java:75
 msgid "street name contains ss"
 msgstr "gatenavn inneholder ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:76
+#: build/trans_validator.java:77
 msgid "relation without type"
 msgstr "relasjon uten angitt type"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:78
+#: build/trans_validator.java:79
 msgid "restaurant without name"
 msgstr "restaurant uten navn"
@@ -36064,236 +36166,548 @@
 #. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
-#: build/trans_validator.java:81
+#: build/trans_validator.java:82
 msgid "unusual tag combination (highway & waterway)"
 msgstr ""
 
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:82
+#: build/trans_validator.java:83
 msgid "unusual tag combination (highway & natural)"
 msgstr ""
 
-#. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
-#. http://irs.gis-lab.info/?layers=landsat&
-#: build/trans_wms.java:2
+#. <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+#. <imagery>
+#. <!--true;Landsat;http://irs.gis-lab.info/?layers=landsat&-->
+#. <entry>
+#. <name>Landsat</name>
+#: build/trans_wms.java:5
 msgid "Landsat"
 msgstr "Landsat"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#: build/trans_wms.java:3
+#. <type>wms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&]]></url>
+#. </entry>
+#. <!--false;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>Open Aerial Map</name>
+#: build/trans_wms.java:12
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. bing:bing
-#: build/trans_wms.java:4
+#. <type>wms</type>
+#. <url><![CDATA[http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&]]></url>
+#. </entry>
+#. <!--different forms for web access-->
+#. <!--true;Bing Sat;bing:bing-->
+#. <entry>
+#. <name>Bing Sat</name>
+#: build/trans_wms.java:19
 msgid "Bing Sat"
 msgstr ""
 
-#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
-#: build/trans_wms.java:5
+#. <type>bing</type>
+#. <!-- url is used as identifier, so put something here -->
+#. <url>http://www.bing.com/maps/</url>
+#. <default>true</default>
+#. </entry>
+#. <!--false;Yahoo Sat;html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?-->
+#. <entry>
+#. <name>Yahoo Sat</name>
+#: build/trans_wms.java:27
 msgid "Yahoo Sat"
 msgstr "Yahoo Sat"
 
-#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png
-#: build/trans_wms.java:6
+#. <type>html</type>
+#. <url><![CDATA[http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?]]></url>
+#. </entry>
+#. <!--Tile based access-->
+#. <!--true;MapQuest Open Aerial;tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png-->
+#. <entry>
+#. <name>MapQuest Open Aerial</name>
+#: build/trans_wms.java:34
 msgid "MapQuest Open Aerial"
 msgstr ""
 
-#. tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm
-#: build/trans_wms.java:7
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png]]></url>
+#. </entry>
+#. <!--true;OpenStreetMap (Mapnik);tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm-->
+#. <entry>
+#. <namUse of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
+#. e>OpenStreetMap (Mapnik)</name>
+#: build/trans_wms.java:42
 msgid "OpenStreetMap (Mapnik)"
 msgstr ""
 
-#. tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm
-#: build/trans_wms.java:8
-msgid "OpenStreetMap (Mapnik B&W)"
-msgstr ""
-
-#. tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm
-#: build/trans_wms.java:9
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;OpenCycleMap;tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm-->
+#. <entry>
+#. <name>OpenCycleMap</name>
+#: build/trans_wms.java:62
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
-#. tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm
-#: build/trans_wms.java:10
+#. <type>tms</type>
+#. <url><![CDATA[http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;TilesAtHome;tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm-->
+#. <entry>
+#. <name>TilesAtHome</name>
+#: build/trans_wms.java:71
 msgid "TilesAtHome"
 msgstr "TilesAtHome"
 
-#. tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm
-#: build/trans_wms.java:11
+#. <type>tms</type>
+#. <url><![CDATA[http://tah.openstreetmap.org/Tiles/tile/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;MapQuest OSM;tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm-->
+#. <entry>
+#. <name>MapQuest OSM</name>
+#: build/trans_wms.java:80
 msgid "MapQuest OSM"
 msgstr ""
 
-#. tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm
-#: build/trans_wms.java:12
+#. <type>tms</type>
+#. <url><![CDATA[http://otile1.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--ODBL map has zoom 1-4, but the tiles are empty-->
+#. <!--false;ODBL coverage;tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm-->
+#. <entry>
+#. <name>ODBL coverage</name>
+#: build/trans_wms.java:90
 msgid "ODBL coverage"
 msgstr ""
 
-#. tms[18]:http://tile.xn--pnvkarte-m4a.de/tilegen;;;osm;osm;osm
-#: build/trans_wms.java:13
-msgid "PNV"
-msgstr ""
-
-#. tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm
-#: build/trans_wms.java:14
+#. <type>tms</type>
+#. <url><![CDATA[http://osm.informatik.uni-leipzig.de/osm_tiles2/{zoom}/{x}/{y}.png]]></url>
+#. <min-zoom>5</min-zoom>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--only for Europe-->
+#. <!--false;ÖPNV;tms[18]:http://tile.xn- ### -pnvkarte-m4a.de/tilegen;;;osm;osm;osm-->
+#. <entry>
+#. <name>ÖPNV</name>
+#: build/trans_wms.java:101
+msgid "ÖPNV"
+msgstr ""
+
+#. <type>tms</type>
+#. <url><![CDATA[http://tile.xn--pnvkarte-m4a.de/tilegen/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>EU</country-code>
+#. </entry>
+#. <!--false;German Style;tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
+#. <entry>
+#. <name>German Style</name>
+#: build/trans_wms.java:111
 msgid "German Style"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#: build/trans_wms.java:15
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>EU</country-code>
+#. </entry>
+#. <!--only for Germany-->
+#. <!--false;Streets NRW Geofabrik.de;http:/Use of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
+#. /tools.geofabrik.de/osmi/view/strassennrw/josmwms?-->
+#. <entry>
+#. <name>Streets NRW Geofabrik.de</name>
+#: build/trans_wms.java:123
 msgid "Streets NRW Geofabrik.de"
 msgstr "Gater NRW Geofabrik.de"
 
-#. tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm
-#: build/trans_wms.java:16
-msgid "Hike & Bike"
-msgstr ""
-
-#. tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm
-#: build/trans_wms.java:17
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/hikebike/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Sorbische Karte;tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm-->
+#. <entry>
+#. <name>Sorbische Karte</name>
+#: build/trans_wms.java:140
 msgid "Sorbische Karte"
 msgstr ""
 
-#. tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm
-#: build/trans_wms.java:18
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-hsb/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Deutsche Karte;tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm-->
+#. <entry>
+#. <name>Deutsche Karte</name>
+#: build/trans_wms.java:150
 msgid "Deutsche Karte"
 msgstr ""
 
-#. tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm
-#: build/trans_wms.java:19
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-de/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;OpenPT Map;tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm-->
+#. <entry>
+#. <name>OpenPT Map</name>
+#: build/trans_wms.java:160
 msgid "OpenPT Map"
 msgstr ""
 
-#. wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&
-#: build/trans_wms.java:20
+#. <type>tms</type>
+#. <url><![CDATA[http://openptmap.de/tiles/{zoom}/{x}/{y}.png]]></url>
+#. <min-zoom>5</min-zoom>
+#. <max-zoom>16</max-zoom>
+#. <bounds min-lat='45.7' min-lon='5.9' max-lat='55.0' max-lon='17.3'/>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Bayern (2m);wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&-->
+#. <entry>
+#. <name>Bayern (2m)</name>
+#: build/trans_wms.java:172
 msgid "Bayern (2m)"
 msgstr ""
 
-#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&
-#: build/trans_wms.java:21
+#. <type>wms</type>
+#. <url><![CDATA[http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&]]></url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--only for Austria-->
+#. <!--false;Geoimage.at;http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&-->
+#. <entry>
+#. <name>Geoimage.at</name>
+#: build/trans_wms.java:180
 msgid "Geoimage.at"
 msgstr ""
 
-#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
-#: build/trans_wms.java:22
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&]]></url>
+#. <country-code>AT</country-code>
+#. </entry>
+#. <!--false;Geoimage.at (HighRes);wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste-->
+#. <entry>
+#. <name>Geoimage.at (HighRes)</name>
+#: build/trans_wms.java:187
 msgid "Geoimage.at (HighRes)"
 msgstr ""
 
-#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#. <type>wms</type>
+#. <url><![CDATA[http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&]]></url>
+#. <bounds min-lat='9.35676' min-lon='46.0872' max-lat='17.3099' max-lon='49.2092'/>
+#. <attribution-text mandatory='true'>geoimage.at</attribution-text>
+#. <terms-of-use-url>http://www.geoimage.at/geoimage/geodatendienste</terms-of-use-url>
+#. <country-code>AT</country-code>
+#. </entry>
+#. <!--only for North America-->
+#. <!--Terraserver USCG - High resolution maps-->
+#. <!--false;MSR Maps Topo;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>MSR Maps Topo</name>
+#: build/trans_wms.java:199
 msgid "MSR Maps Topo"
 msgstr ""
 
-#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:24
+#. <type>wms</type>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&]]></url>
+#. <country-code>US</country-code>
+#. </entry>
+#. <!--false;MSR Maps Urban;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>MSR Maps Urban</name>
+#: build/trans_wms.java:206
 msgid "MSR Maps Urban"
 msgstr ""
 
-#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:25
+#. <type>wms</type>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&]]></url>
+#. <country-code>US</country-code>
+#. </entry>
+#. <!--only for Czech Republic-->
+#. <!--false;Czech CUZK:KM;http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&-->
+#. <entry>
+#. <name>Czech CUZK:KM</name>
+#: build/trans_wms.java:214
 msgid "Czech CUZK:KM"
 msgstr "Tsjekkisk CUZK:KM"
 
-#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:26
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&]]></url>
+#. <country-code>CZ</country-code>
+#. </entry>
+#. <!--false;Czech UHUL:ORTOFOTO;http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&-->
+#. <entry>
+#. <name>Czech UHUL:ORTOFOTO</name>
+#: build/trans_wms.java:221
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Tsjekkisk UHUL:ORTOFOTO"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:27
+#. <type>wms</type>
+#. <url><![CDATA[http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&]]></url>
+#. <country-code>CZ</country-code>
+#. </entry>
+#. <!--only for GB-->
+#. <!--false;NPE Maps;http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&-->
+#. <entry>
+#. <name>NPE Maps</name>
+#: build/trans_wms.java:229
 msgid "NPE Maps"
 msgstr "NPE-kart"
 
-#. http://timsc.dev.openstreetmap.org/wms2/map.php?
-#: build/trans_wms.java:28
+#. <type>wms</type>
+#. <url><![CDATA[http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--false;NPE Maps (Tim);http://timsc.dev.openstreetmap.org/wms2/map.php?-->
+#. <entry>
+#. <name>NPE Maps (Tim)</name>
+#: build/trans_wms.java:236
 msgid "NPE Maps (Tim)"
 msgstr "NPE-kart (Tim)"
 
-#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:29
+#. <type>wms</type>
+#. <url><![CDATA[http://timsc.dev.openstreetmap.org/wms2/map.php?]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--false;7th Series (OS7);http://ooc.openstreetmap.org/wms/map.php?source=os7&-->
+#. <entry>
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:243
 msgid "7th Series (OS7)"
 msgstr ""
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#. <type>wms</type>
+#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--only for Japan-->
+#. <!--false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO)</name>
+#: build/trans_wms.java:251
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO01)</name>
+#: build/trans_wms.java:258
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO02)</name>
+#: build/trans_wms.java:265
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:33
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO03)</name>
+#: build/trans_wms.java:272
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
-#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:34
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--only for Italy-->
+#. <!--false;Lodi - Italy;http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&-->
+#. <entry>
+#. <name>Lodi - Italy</name>
+#: build/trans_wms.java:280
 msgid "Lodi - Italy"
 msgstr "Lodi, Italia"
 
-#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:35
+#. <type>wms</type>
+#. <url><![CDATA[http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--false;Sicily - Italy;http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&-->
+#. <entry>
+#. <name>Sicily - Italy</name>
+#: build/trans_wms.java:287
 msgid "Sicily - Italy"
 msgstr "Sicilia, Italia"
 
-#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:36
+#. <type>wms</type>
+#. <url><![CDATA[http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--false;PCN 2006 - Italy;http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&-->
+#. <entry>
+#. <name>PCN 2006 - Italy</name>
+#: build/trans_wms.java:294
 msgid "PCN 2006 - Italy"
 msgstr ""
 
-#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:37
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--only for France-->
+#. <!--false;SPOTMaps (France);http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html-->
+#. <entry>
+#. <name>SPOTMaps (France)</name>
+#: build/trans_wms.java:302
 msgid "SPOTMaps (France)"
 msgstr ""
 
-#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:38
+#. <type>wms</type>
+#. <url><![CDATA[http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&]]></url>
+#. <eula mandatory='true'><![CDATA[http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html]]></eula>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <!--only for Spain-->
+#. <!--false;PNOA Spain;http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS-->
+#. <entry>
+#. <name>PNOA Spain</name>
+#: build/trans_wms.java:311
 msgid "PNOA Spain"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:39
+#. <type>wms</type>
+#. <url><![CDATA[http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS]]></eula>
+#. <country-code>ES</country-code>
+#. </entry>
+#. <!--only for Estonia-->
+#. <!--false;Estonia Basemap (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&-->
+#. <entry>
+#. <name>Estonia Basemap (Maaamet)</name>
+#: build/trans_wms.java:320
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:40
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--false;Estonia Ortho (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&-->
+#. <entry>
+#. <name>Estonia Ortho (Maaamet)</name>
+#: build/trans_wms.java:327
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:41
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--false;Estonia Multi (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&-->
+#. <entry>
+#. <name>Estonia Multi (Maaamet)</name>
+#: build/trans_wms.java:334
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
-#. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:42
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--only for Denmark-->
+#. <!--false;Fugro (Denmark);tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2-->
+#. <entry>
+#. <name>Fugro (Denmark)</name>
+#: build/trans_wms.java:342
 msgid "Fugro (Denmark)"
 msgstr ""
 
-#. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:43
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png]]></url>
+#. <bounds min-lat='54.46819' min-lon='8.01887' max-lat='57.8229' max-lon='15.30992'/>
+#. <max-zoom>19</max-zoom>
+#. <attribution-text mandatory='true'>Fugro Aerial Mapping</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/Fugro</attribution-url>
+#. <terms-of-use-url>http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2</terms-of-use-url>
+#. <country-code>DK</country-code>
+#. </entry>
+#. <!--false;Stevns (Denmark);tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune-->
+#. <entry>
+#. <name>Stevns (Denmark)</name>
+#: build/trans_wms.java:354
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
-#: build/trans_wms.java:44
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png]]></url>
+#. <bounds min-lat='55.23403' min-lon='12.09144' max-lat='55.43647' max-lon='12.47712'/>
+#. <max-zoom>20</max-zoom>
+#. <attribution-text mandatory='true'>Stevns Kommune</attribution-text>
+#. <country-code>DK</country-code>
+#. </entry>
+#. <!--only for Phillipines-->
+#. <!--false;Pangasinan (Phillipines HiRes);tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines-->
+#. <entry>
+#. <name>Pangasinan (Phillipines HiRes)</name>
+#: build/trans_wms.java:365
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
-#. scanex:irs;;;IRS
-#: build/trans_wms.java:45
+#. <type>tms</type>
+#. <url><![CDATA[http://gravitystorm.dev.openstreetmap.org/imagery/philippines/{zoom}/{x}/{y}.png]]></url>
+#. <country-code>PH</country-code>
+#. </entry>
+#. <!--only for Russia-->
+#. <!--false;ScanEx IRS;scanex:irs;;;IRS-->
+#. <entry>
+#. <name>ScanEx IRS</name>
+#: build/trans_wms.java:373
 msgid "ScanEx IRS"
 msgstr ""
 
-#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
-#: build/trans_wms.java:46
+#. <type>scanex</type>
+#. <!-- url is used as identifier, so put something here -->
+#. <url>http://irs.gis-lab.info/</url>
+#. <attribution-text mandatory='true'>IRS</attribution-text>
+#. <country-code>RU</country-code>
+#. </entry>
+#. <!--only for South Africa-->
+#. <!--false;South Africa Topo (OOC);tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1-->
+#. <entry>
+#. <name>South Africa Topo (OOC)</name>
+#: build/trans_wms.java:383
 msgid "South Africa Topo (OOC)"
 msgstr ""
@@ -39992,12 +40406,10 @@
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:58
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:21
-#, fuzzy
 msgid "Merge overlap"
-msgstr "Flett lag"
+msgstr ""
 
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:56
-#, fuzzy
 msgid "Merge overlap of ways."
-msgstr "Overlappende linjer."
+msgstr ""
 
 #. Commit
@@ -43354,4 +43766,28 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
+#, fuzzy
+msgid "Open custom URL"
+msgstr "Åpne en URL."
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+msgid "Opens specified URL browser"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:141
+msgid ""
+"You can open custom URL for <b>one</b> selected object<br/> <b>&#123;"
+"key&#125;</b> is replaced with the tag walue<br/> <b>&#123;#id&#125;</b> is "
+"replaced with the element ID<br/> <b>&#123;#type&#125;</b> is replaced with "
+"\"node\",\"way\" or \"relation\" <br/> <b>&#123;#lat&#125; , &#123;#lon&#125;"
+"</b> is replaced with element latitude/longitude"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:151
+#, fuzzy
+msgid "Configure custom URL"
+msgstr "Konfigurer"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split Object"
@@ -43409,5 +43845,5 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:46
 msgid "More tools"
 msgstr ""
@@ -43890,11 +44326,2 @@
 msgid "Drive a race car on this layer"
 msgstr ""
-
-#~ msgid "Reversed water: land not on left side"
-#~ msgstr "Feil retning på Vannlinje: Land er ikke på venstre side"
-
-#~ msgid "Incline Steep"
-#~ msgstr "Sterk stigning"
-
-#~ msgid "fossil"
-#~ msgstr "fossil"
