Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 23656)
+++ applications/editors/josm/i18n/po/nb.po	(revision 23802)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-16 21:46+0200\n"
+"POT-Creation-Date: 2010-10-24 11:22+0200\n"
 "PO-Revision-Date: 2010-10-11 01:52+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-16 19:37+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 09:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -90,4 +90,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:225
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
@@ -160,4 +161,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:67
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -274,7 +276,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
@@ -289,4 +291,6 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:100
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:128
@@ -324,5 +328,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
 msgid "Merge"
 msgstr "Flett"
@@ -397,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:334
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -420,5 +424,6 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:40
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:45
@@ -459,4 +464,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:43
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
@@ -568,4 +574,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
 #, java-format
@@ -671,5 +678,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:290
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
@@ -700,4 +707,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:204
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:205
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:99
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:100
 msgid "Overwrite"
 msgstr "Skriv over"
@@ -705,4 +714,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:102
 msgid "File exists. Overwrite?"
 msgstr "Filen finnes. Vil du overskrive filen?"
@@ -811,5 +821,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
 msgid "Duplicate"
@@ -875,10 +885,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:353
 msgid "Export to GPX..."
 msgstr "Eksporter til GPX …"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:352
 msgid "Export the data to GPX file."
 msgstr "Eksporter dataene til GPX-fil."
@@ -910,22 +920,22 @@
 msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:334
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
 msgid "Join overlapping Areas"
 msgstr "Slå sammen områder med overlapp"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:334
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
 msgid "Joins areas that overlap each other"
 msgstr "Slår sammen områder med overlapp"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:346
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Please select at least one closed way that should be joined."
 msgstr "Velg minst én lukket linje som skal sammenføyes."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:353
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:326
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:76
@@ -936,5 +946,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:342
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
@@ -942,15 +952,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:370
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343
 msgid "Are you really sure to continue?"
 msgstr "Vil du virkelig fortsette?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:344
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:377
 msgid "Please abort if you are not sure"
 msgstr "Angre hvis du er usikker"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:388
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:405
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:378
 msgid "No intersection found. Nothing was changed."
 msgstr "Fant ingen skjæring. Ingen endringer ble gjort."
@@ -958,29 +968,29 @@
 #. revert changes
 #. FIXME: this is dirty hack
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:384
 msgid "Reverting changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:464
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:436
 msgid "Removed duplicate nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:445
 msgid "Added node on all intersections"
 msgstr "Noder er lagt til i alle skjæringspunkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:523
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:496
 msgid "Assemble new polygons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:501
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:532
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Joined overlapping areas"
 msgstr "Slo sammen overlappende områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:507
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -988,23 +998,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:594
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:566
 msgid "Fix tag conflicts"
 msgstr "Reparer konflikter i egenskaper."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1074
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:840
 msgid "Split ways into fragments"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1552
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1227
 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1562
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1237
 msgid ""
 "Sorry. Cannot handle way that is outer in multiple multipolygon relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1567
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1574
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1242
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1249
 msgid ""
 "Sorry. Cannot handle way that is both inner and outer in multipolygon "
@@ -1012,18 +1022,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1579
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1254
 msgid ""
 "Sorry. Cannot handle way that is inner in multiple multipolygon relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1684
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1356
 msgid "Removed Element from Relations"
 msgstr "Fjernede Element fra Relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1755
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1426
 msgid "Remove tags from inner ways"
 msgstr "Fjern egenskaper fra indre linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1788
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1459
 msgid "Join Areas Function"
 msgstr "Funksjon Slå sammen Areal"
@@ -1552,6 +1562,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1562,4 +1572,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:685
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:698
@@ -1573,4 +1584,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:74
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
@@ -1615,5 +1627,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:323
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:148
 #: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
@@ -1624,5 +1637,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:322
 msgid "Save the current data."
 msgstr "Lagre gjeldende data."
@@ -1679,10 +1692,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:338
 msgid "Save As..."
 msgstr "Lagre som …"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:337
 msgid "Save the current data to a new file."
 msgstr "Lagre aktive data i ny fil."
@@ -2475,5 +2488,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:346
 msgid "Extrude Way"
 msgstr "Trekk ut linje"
@@ -2498,5 +2511,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3030,4 +3043,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:128
@@ -3765,6 +3779,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:323
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:351
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:334
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:362
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3914,26 +3928,30 @@
 msgstr "Swiss Grid (Sveits)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+msgid "LKS-92 (Latvia TM)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:62
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:123
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:142
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
 msgid "North"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:149
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:158
 msgid "Offset 3.000.000m east"
 msgstr ""
@@ -4018,5 +4036,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:4073
 msgid "railway"
 msgstr "jernbane"
@@ -4106,5 +4124,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4674
+#: build/trans_style.java:4722
 msgid "building"
 msgstr "bygning"
@@ -4413,4 +4431,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:259
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:150
 msgid "Discard"
 msgstr ""
@@ -4479,9 +4498,10 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
+#: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26
 msgid "Tools"
 msgstr "Verktøy"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -4501,13 +4521,13 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:262
+#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:260
 msgid "Hide this button"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:263
+#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:261
 msgid "Click the arrow at the bottom to show it again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:374
+#: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:372
 msgid "Hide or show this toggle button"
 msgstr ""
@@ -4579,5 +4599,5 @@
 msgstr "Lengden på segmentet som tegnes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:207
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4585,19 +4605,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:306
 msgid "(no object)"
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:442
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "Laget er ikke i lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:706
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -5347,5 +5367,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:308
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:237
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:265
 msgid "none"
 msgstr "ingen"
@@ -5353,5 +5373,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
-#: build/trans_presets.java:3882
+#: build/trans_presets.java:4004
 msgid "all"
 msgstr "alle"
@@ -5630,5 +5650,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:170
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5933,47 +5953,57 @@
 msgstr "Lukk dialogen og ikke opprett et nytt punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:170
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:169
 msgid "Open a list of all loaded layers."
 msgstr "Liste over alle innleste lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
 msgid "Toggle visible state of the selected layer."
 msgstr "Slå av/på visning av Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 msgid "Show/Hide"
 msgstr "Vis/Skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450
+#, fuzzy
+msgid "Adjust opacity of the layer."
+msgstr "Juster posisjon til WMS laget"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:451
+#, fuzzy
+msgid "Opacity"
+msgstr "Kapasitet"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:533
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:655
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:752
 msgid "Move the selected layer one row up."
 msgstr "Flytt laget en rad opp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:771
 msgid "Move the selected layer one row down."
 msgstr "Flytt laget en rad ned."
@@ -5987,5 +6017,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3897
+#: build/trans_presets.java:4019
 msgid "Relations"
 msgstr "Relasjoner"
@@ -6687,19 +6717,19 @@
 #. item "Airport/Terminal" text "Name"
 #. <key key="tourism" value="hotel" />
-#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Facilities/Accommodation/Hotel" text "Name"
 #. <key key="tourism" value="motel" />
-#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Facilities/Accommodation/Motel" text "Name"
 #. <key key="tourism" value="guest_house" />
-#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Facilities/Accommodation/Guest House" text "Name"
 #. <key key="tourism" value="chalet" />
-#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Facilities/Accommodation/Chalet" text "Name"
 #. <key key="tourism" value="hostel" />
-#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Facilities/Accommodation/Hostel" text "Name"
 #. <key key="tourism" value="alpine_hut" />
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Facilities/Accommodation/Alpine Hut" text "Name"
 #. <key key="tourism" value="caravan_site" />
-#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Facilities/Accommodation/Caravan Site" text "Name"
 #. <key key="tourism" value="camp_site" />
-#. item "Travel/Accomodation/Camping Site" text "Name"
+#. item "Facilities/Accommodation/Camping Site" text "Name"
 #. <key key="amenity" value="restaurant" />
 #. item "Food+Drinks/Restaurant" text "Name"
@@ -6720,21 +6750,6 @@
 #. <key key="tourism" value="attraction" />
 #. item "Tourism/Attraction" text "Name"
-#. <key key="tourism" value="museum" />
-#. item "Tourism/Museum" text "Name"
-#. <key key="tourism" value="zoo" />
-#. item "Tourism/Zoo" text "Name"
-#. <key key="tourism" value="theme_park" />
-#. item "Tourism/Theme Park" text "Name"
-#. <key key="tourism" value="artwork" />
-#. item "Tourism/Artwork" text "Name"
 #. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Viewpoint" text "Name"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Shelter" text "Name"
-#. <key key="tourism" value="picnic_site" />
-#. item "Tourism/Picnic Site" text "Name"
-#. <space />
-#. <key key="amenity" value="bbq" />
-#. item "Tourism/Public Grill" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
@@ -6764,33 +6779,85 @@
 #. <key key="tourism" value="information" />
 #. item "Tourism/Other Information Points" text "Name"
-#. <key key="historic" value="castle" />
-#. item "Historic Places/Castle" text "Name"
-#. <key key="historic" value="ruins" />
-#. item "Historic Places/Ruins" text "Name"
-#. <key key="historic" value="archaeological_site" />
-#. item "Historic Places/Archaeological Site" text "Name"
-#. <key key="historic" value="battlefield" />
-#. item "Historic Places/Battlefield" text "Name"
-#. <key key="geological" value="palaeontological_site" />
-#. item "Historic Places/Palaeontological Site" text "Name"
-#. <key key="historic" value="monument" />
-#. item "Historic Places/Monument" text "Name"
-#. <key key="historic" value="memorial" />
-#. item "Historic Places/Memorial" text "Name"
-#. <key key="historic" value="wayside_cross" />
-#. item "Historic Places/Wayside Cross" text "Name"
-#. <key key="historic" value="wayside_shrine" />
-#. item "Historic Places/Wayside Shrine" text "Name"
-#. <key key="historic" value="boundary_stone" />
-#. item "Historic Places/Boundary Stone" text "Name"
+#. <key key="amenity" value="cinema" />
+#. item "Leisure/Cinema" text "Name"
+#. <key key="tourism" value="zoo" />
+#. item "Leisure/Zoo" text "Name"
+#. <key key="tourism" value="theme_park" />
+#. item "Leisure/Theme Park" text "Name"
 #. <key key="leisure" value="water_park" />
 #. item "Leisure/Water Park" text "Name"
-#. <key key="leisure" value="playground" />
-#. item "Leisure/Playground" text "Name"
-#. <key key="leisure" value="fishing" />
-#. item "Leisure/Fishing" text "Name"
 #. <space />
 #. <key key="leisure" value="sauna" />
 #. item "Leisure/Sauna" text "Name"
+#. <key key="leisure" value="playground" />
+#. item "Leisure/Playground" text "Name"
+#. <key key="tourism" value="picnic_site" />
+#. item "Leisure/Picnic Site" text "Name"
+#. <space />
+#. <key key="amenity" value="bbq" />
+#. item "Leisure/Public Grill" text "Name"
+#. <key key="leisure" value="fishing" />
+#. item "Leisure/Fishing" text "Name"
+#. <key key="tourism" value="museum" />
+#. item "Culture/Museum" text "Name"
+#. <key key="amenity" value="theatre" />
+#. item "Culture/Theatre" text "Name"
+#. <key key="amenity" value="library" />
+#. item "Culture/Library" text "Name"
+#. <key key="amenity" value="arts_centre" />
+#. item "Culture/Arts Centre" text "Name"
+#. <key key="tourism" value="artwork" />
+#. item "Culture/Artwork" text "Name"
+#. <key key="amenity" value="place_of_worship" />
+#. item "Culture/Place of Worship" text "Name"
+#. <space />
+#. <key key="amenity" value="studio" />
+#. item "Culture/Recording Studio" text "Name"
+#. <key key="amenity" value="public_building" />
+#. item "Public Building/Public Building" text "Name"
+#. <key key="amenity" value="townhall" />
+#. item "Public Building/Town hall" text "Name"
+#. <space />
+#. <key key="amenity" value="community_centre" />
+#. item "Public Building/Community Centre" text "Name"
+#. <key key="amenity" value="embassy" />
+#. item "Public Building/Embassy" text "Name"
+#. <key key="amenity" value="courthouse" />
+#. item "Public Building/Courthouse" text "Name"
+#. <key key="amenity" value="prison" />
+#. item "Public Building/Prison" text "Name"
+#. <key key="amenity" value="police" />
+#. item "Public Building/Police" text "Name"
+#. <key key="amenity" value="fire_station" />
+#. item "Public Building/Fire Station" text "Name"
+#. <key key="amenity" value="post_office" />
+#. item "Public Building/Post Office" text "Name"
+#. <key key="amenity" value="kindergarten" />
+#. item "Education/Kindergarten" text "Name"
+#. <key key="amenity" value="school" />
+#. item "Education/School" text "Name"
+#. <key key="amenity" value="university" />
+#. item "Education/University" text "Name"
+#. <key key="amenity" value="college" />
+#. item "Education/College" text "Name"
+#. <space />
+#. <key key="amenity" value="driving_school" />
+#. item "Education/Driving School" text "Name"
+#. <key key="amenity" value="doctors" />
+#. item "Health/Doctors" text "Name"
+#. <key key="amenity" value="dentist" />
+#. item "Health/Dentist" text "Name"
+#. item "Health/Pharmacy" text "Name"
+#. <space />
+#. <key key="shop" value="hearing_aids" />
+#. item "Health/Hearing Aids" text "Name"
+#. <key key="amenity" value="hospital" />
+#. item "Health/Hospital" text "Name"
+#. <key key="amenity" value="veterinary" />
+#. item "Health/Veterinary" text "Name"
+#. <key key="amenity" value="shelter" />
+#. item "Facilities/Shelter" text "Name"
+#. <key key="amenity" value="drinking_water" />
+#. item "Facilities/Drinking Water" text "Name"
 #. <key key="leisure" value="stadium" />
 #. item "Sports/Sport Facilities/Stadium" text "Name"
@@ -6855,4 +6922,10 @@
 #. <key key="sport" value="basketball" />
 #. item "Sport (Ball)/Basketball" text "Name"
+#. <space />
+#. <key key="sport" value="volleyball" />
+#. item "Sport (Ball)/Volleyball" text "Name"
+#. <space />
+#. <key key="sport" value="beachvolleyball" />
+#. item "Sport (Ball)/Beachvolleyball" text "Name"
 #. <key key="sport" value="golf" />
 #. item "Sport (Ball)/Golf" text "Name"
@@ -6889,218 +6962,194 @@
 #. <key key="sport" value="rc_car" />
 #. item "Motorsport/RC Car" text "Name"
-#. <key key="amenity" value="public_building" />
-#. item "Man-Made/Buildings/Public Building" text "Name"
-#. <key key="amenity" value="townhall" />
-#. item "Man-Made/Buildings/Town hall" text "Name"
-#. <key key="amenity" value="embassy" />
-#. item "Man-Made/Buildings/Embassy" text "Name"
-#. <key key="amenity" value="courthouse" />
-#. item "Man-Made/Buildings/Courthouse" text "Name"
-#. <key key="amenity" value="prison" />
-#. item "Man-Made/Buildings/Prison" text "Name"
-#. <key key="amenity" value="police" />
-#. item "Man-Made/Buildings/Police" text "Name"
-#. <key key="amenity" value="fire_station" />
-#. item "Man-Made/Buildings/Fire Station" text "Name"
-#. <key key="amenity" value="post_office" />
-#. item "Man-Made/Buildings/Post Office" text "Name"
-#. <space />
-#. <key key="amenity" value="studio" />
-#. item "Man-Made/Buildings/Studio" text "Name"
-#. <key key="amenity" value="kindergarten" />
-#. item "Man-Made/Buildings/Kindergarten" text "Name"
-#. <key key="amenity" value="school" />
-#. item "Man-Made/Buildings/School" text "Name"
-#. <key key="amenity" value="university" />
-#. item "Man-Made/Buildings/University" text "Name"
-#. <key key="amenity" value="college" />
-#. item "Man-Made/Buildings/College" text "Name"
-#. <space />
-#. <key key="amenity" value="driving_school" />
-#. item "Man-Made/Buildings/Driving School" text "Name"
-#. <key key="amenity" value="cinema" />
-#. item "Man-Made/Buildings/Cinema" text "Name"
-#. <key key="amenity" value="library" />
-#. item "Man-Made/Buildings/Library" text "Name"
-#. <key key="amenity" value="arts_centre" />
-#. item "Man-Made/Buildings/Arts Centre" text "Name"
-#. <key key="amenity" value="theatre" />
-#. item "Man-Made/Buildings/Theatre" text "Name"
-#. <key key="amenity" value="place_of_worship" />
-#. item "Man-Made/Buildings/Place of Worship" text "Name"
+#. <key key="man_made" value="tower" />
+#. item "Man Made/Man Made/Tower" text "Name"
 #. <key key="man_made" value="works" />
-#. item "Man Made/Works" text "Name"
-#. <key key="man_made" value="tower" />
-#. item "Man Made/Tower" text "Name"
+#. item "Man Made/Man Made/Works" text "Name"
 #. <space />
 #. <key key="man_made" value="chimney" />
-#. item "Man Made/Chimney" text "Name"
+#. item "Man Made/Man Made/Chimney" text "Name"
+#. <key key="man_made" value="windmill" />
+#. item "Man Made/Man Made/Windmill" text "Name"
+#. <key key="man_made" value="gasometer" />
+#. item "Man Made/Man Made/Gasometer" text "Name"
+#. <key key="man_made" value="crane" />
+#. item "Man Made/Man Made/Crane" text "Name"
+#. <key key="man_made" value="mineshaft" />
+#. item "Man Made/Man Made/Mineshaft" text "Name"
+#. <key key="man_made" value="adit" />
+#. item "Man Made/Man Made/Adit" text "Name"
 #. <key key="man_made" value="water_tower" />
-#. item "Man Made/Water Tower" text "Name"
-#. <key key="man_made" value="gasometer" />
-#. item "Man Made/Gasometer" text "Name"
-#. <key key="man_made" value="lighthouse" />
-#. item "Man Made/Lighthouse" text "Name"
-#. <key key="man_made" value="windmill" />
-#. item "Man Made/Windmill" text "Name"
+#. item "Man Made/Man Made/Water Tower" text "Name"
+#. <space />
+#. <key key="man_made" value="water_works" />
+#. item "Man Made/Man Made/Water Works" text "Name"
+#. <key key="man_made" value="wastewater_plant" />
+#. item "Man Made/Man Made/Wastewater Plant" text "Name"
 #. <space />
 #. <key key="man_made" value="watermill" />
-#. item "Man Made/Watermill" text "Name"
-#. <key key="man_made" value="wastewater_plant" />
-#. item "Man Made/Wastewater Plant" text "Name"
-#. <key key="man_made" value="crane" />
-#. item "Man Made/Crane" text "Name"
-#. <key key="man_made" value="mineshaft" />
-#. item "Man Made/Mineshaft" text "Name"
+#. item "Man Made/Man Made/Watermill" text "Name"
+#. <key key="amenity" value="fountain" />
+#. item "Man Made/Man Made/Fountain" text "Name"
+#. <key key="man_made" value="water_well" />
+#. item "Man Made/Man Made/Water Well" text "Name"
+#. <key key="man_made" value="lighthouse" />
+#. item "Man Made/Man Made/Lighthouse" text "Name"
 #. <key key="man_made" value="beacon" />
-#. item "Man Made/Beacon" text "Name"
+#. item "Man Made/Man Made/Beacon" text "Name"
+#. <space />
+#. <key key="man_made" value="measurement_station" />
+#. item "Man Made/Man Made/Measurement Station" text "Name"
 #. <key key="man_made" value="survey_point" />
-#. item "Man Made/Survey Point" text "Name"
+#. item "Man Made/Man Made/Survey Point" text "Name"
 #. <key key="man_made" value="surveillance" />
-#. item "Man Made/Surveillance" text "Name"
-#. item "Man Made/Power Generator" text "Name"
+#. item "Man Made/Man Made/Surveillance" text "Name"
+#. item "Power/Power Generator" text "Name"
 #. <key key="power" value="station" />
-#. item "Man Made/Power Station" text "Name"
-#. <key key="amenity" value="fountain" />
-#. item "Amenities/Fountain" text "Name"
-#. <key key="amenity" value="drinking_water" />
-#. item "Amenities/Drinking Water" text "Name"
+#. item "Power/Power Station" text "Name"
+#. <key key="historic" value="castle" />
+#. item "Historic Places/Castle" text "Name"
+#. <key key="historic" value="ruins" />
+#. item "Historic Places/Ruins" text "Name"
+#. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Archaeological Site" text "Name"
+#. <key key="historic" value="battlefield" />
+#. item "Historic Places/Battlefield" text "Name"
+#. <key key="geological" value="palaeontological_site" />
+#. item "Historic Places/Palaeontological Site" text "Name"
+#. <key key="historic" value="monument" />
+#. item "Historic Places/Monument" text "Name"
+#. <key key="historic" value="memorial" />
+#. item "Historic Places/Memorial" text "Name"
+#. <key key="historic" value="wayside_cross" />
+#. item "Historic Places/Wayside Cross" text "Name"
+#. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Wayside Shrine" text "Name"
+#. <key key="historic" value="boundary_stone" />
+#. item "Historic Places/Boundary Stone" text "Name"
 #. <key key="shop" value="supermarket" />
-#. item "Food/Supermarket" text "Name"
+#. item "Shops/Food/Supermarket" text "Name"
 #. <key key="shop" value="convenience" />
-#. item "Food/Convenience Store" text "Name"
+#. item "Shops/Food/Convenience Store" text "Name"
 #. <key key="shop" value="kiosk" />
-#. item "Food/Kiosk" text "Name"
-#. <key key="shop" value="confectionery" />
-#. item "Food/Confectionery" text "Name"
+#. item "Shops/Food/Kiosk" text "Name"
 #. <key key="shop" value="bakery" />
-#. item "Food/Baker" text "Name"
+#. item "Shops/Food/Baker" text "Name"
 #. <key key="shop" value="butcher" />
-#. item "Food/Butcher" text "Name"
+#. item "Shops/Food/Butcher" text "Name"
 #. <space />
 #. <key key="shop" value="seafood" />
-#. item "Food/Seafood" text "Name"
+#. item "Shops/Food/Seafood" text "Name"
 #. <space />
 #. <key key="shop" value="deli" />
-#. item "Food/Deli (Fine Food)" text "Name"
+#. item "Shops/Food/Deli (Fine Food)" text "Name"
+#. <key key="shop" value="confectionery" />
+#. item "Shops/Food/Confectionery" text "Name"
 #. <space />
 #. <key key="amenity" value="marketplace" />
-#. item "Food/Marketplace" text "Name"
+#. item "Shops/Food/Marketplace" text "Name"
 #. <space />
 #. <key key="shop" value="greengrocer" />
-#. item "Food/Greengrocer" text "Name"
+#. item "Shops/Food/Greengrocer" text "Name"
 #. <key key="shop" value="organic" />
-#. item "Food/Organic" text "Name"
+#. item "Shops/Food/Organic" text "Name"
 #. <key key="shop" value="alcohol" />
-#. item "Food/Alcohol" text "Name"
+#. item "Shops/Food/Alcohol" text "Name"
 #. <key key="shop" value="beverages" />
-#. item "Food/Beverages" text "Name"
-#. <key key="shop" value="chemist" />
-#. item "Shops/Chemist" text "Name"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Hairdresser" text "Name"
-#. <key key="shop" value="optician" />
-#. item "Shops/Optician" text "Name"
-#. <space />
-#. <key key="shop" value="hearing_aids" />
-#. item "Shops/Hearing Aids" text "Name"
-#. <space />
-#. <key key="shop" value="jewelry" />
-#. item "Shops/Jewelry" text "Name"
-#. <space />
-#. <key key="shop" value="erotic" />
-#. item "Shops/Erotic" text "Name"
-#. <space />
-#. <key key="shop" value="department_store" />
-#. item "Shops/Department Store" text "Name"
-#. <space />
-#. <key key="shop" value="mall" />
-#. item "Shops/Mall" text "Name"
+#. item "Shops/Food/Beverages" text "Name"
 #. <key key="shop" value="clothes" />
-#. item "Shops/Clothes" text "Name"
+#. item "Clothes/Clothes" text "Name"
 #. <space />
 #. <key key="shop" value="boutique" />
-#. item "Shops/Boutique" text "Name"
+#. item "Clothes/Boutique" text "Name"
 #. <key key="shop" value="shoes" />
-#. item "Shops/Shoes" text "Name"
+#. item "Clothes/Shoes" text "Name"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/Outdoor" text "Name"
+#. item "Clothes/Outdoor" text "Name"
 #. <key key="shop" value="sports" />
-#. item "Shops/Sports" text "Name"
+#. item "Clothes/Sports" text "Name"
 #. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Dry Cleaning" text "Name"
+#. item "Clothes/Dry Cleaning" text "Name"
 #. <key key="shop" value="laundry" />
-#. item "Shops/Laundry" text "Name"
+#. item "Clothes/Laundry" text "Name"
 #. <key key="shop" value="tailor" />
-#. item "Shops/Tailor" text "Name"
+#. item "Clothes/Tailor" text "Name"
 #. <space />
 #. <key key="shop" value="fabric" />
-#. item "Shops/Fabric" text "Name"
+#. item "Clothes/Fabric" text "Name"
 #. <key key="shop" value="computer" />
-#. item "Shops/Computer" text "Name"
+#. item "Electronic/Computer" text "Name"
 #. <key key="shop" value="electronics" />
-#. item "Shops/Electronics" text "Name"
+#. item "Electronic/Electronics" text "Name"
 #. <space />
 #. <key key="shop" value="mobile_phone" />
-#. item "Shops/Mobile Phone" text "Name"
+#. item "Electronic/Mobile Phone" text "Name"
 #. <space />
 #. <key key="shop" value="vacuum_cleaner" />
-#. item "Shops/Vacuum Cleaner" text "Name"
+#. item "Electronic/Vacuum Cleaner" text "Name"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Hifi" text "Name"
+#. item "Electronic/Hifi" text "Name"
 #. <key key="shop" value="video" />
-#. item "Shops/Video" text "Name"
-#. <key key="shop" value="florist" />
-#. item "Shops/Florist" text "Name"
-#. <key key="shop" value="garden_centre" />
-#. item "Shops/Garden Centre" text "Name"
-#. <key key="shop" value="hardware" />
-#. item "Shops/Hardware" text "Name"
-#. <space />
-#. <key key="shop" value="paint" />
-#. item "Shops/Paint" text "Name"
-#. <key key="shop" value="doityourself" />
-#. item "Shops/Do-it-yourself-store" text "Name"
-#. <key key="shop" value="furniture" />
-#. item "Shops/Furniture" text "Name"
-#. <space />
-#. <key key="shop" value="kitchen" />
-#. item "Shops/Kitchen" text "Name"
-#. <space />
-#. <key key="shop" value="curtain" />
-#. item "Shops/Curtain" text "Name"
-#. <space />
-#. <key key="shop" value="frame" />
-#. item "Shops/Frame" text "Name"
-#. <key key="shop" value="stationery" />
-#. item "Shops/Stationery" text "Name"
-#. <space />
-#. <key key="shop" value="copyshop" />
-#. item "Shops/Copyshop" text "Name"
-#. <key key="shop" value="books" />
-#. item "Shops/Book Store" text "Name"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Travel Agency" text "Name"
-#. <space />
-#. <key key="shop" value="musical_instrument" />
-#. item "Shops/Musical Instrument" text "Name"
-#. <key key="shop" value="toys" />
-#. item "Shops/Toys" text "Name"
-#. <space />
-#. <key key="shop" value="variety_store" />
-#. item "Shops/Variety Store" text "Name"
+#. item "Electronic/Video" text "Name"
 #. <key key="amenity" value="bank" />
 #. item "Cash/Bank" text "Name"
 #. <key key="amenity" value="bureau_de_change" />
 #. item "Cash/Money Exchange" text "Name"
-#. <key key="amenity" value="doctors" />
-#. item "Health/Doctors" text "Name"
-#. <key key="amenity" value="dentist" />
-#. item "Health/Dentist" text "Name"
-#. item "Health/Pharmacy" text "Name"
-#. <key key="amenity" value="hospital" />
-#. item "Health/Hospital" text "Name"
-#. <key key="amenity" value="veterinary" />
-#. item "Health/Veterinary" text "Name"
+#. <space />
+#. <key key="shop" value="department_store" />
+#. item "Other/Department Store" text "Name"
+#. <space />
+#. <key key="shop" value="mall" />
+#. item "Other/Mall" text "Name"
+#. <key key="shop" value="chemist" />
+#. item "Other/Chemist" text "Name"
+#. <key key="shop" value="hairdresser" />
+#. item "Other/Hairdresser" text "Name"
+#. <key key="shop" value="optician" />
+#. item "Other/Optician" text "Name"
+#. <space />
+#. <key key="shop" value="jewelry" />
+#. item "Other/Jewelry" text "Name"
+#. <space />
+#. <key key="shop" value="erotic" />
+#. item "Other/Erotic" text "Name"
+#. <key key="shop" value="florist" />
+#. item "Other/Florist" text "Name"
+#. <key key="shop" value="garden_centre" />
+#. item "Other/Garden Centre" text "Name"
+#. <key key="shop" value="doityourself" />
+#. item "Other/Do-it-yourself-store" text "Name"
+#. <key key="shop" value="hardware" />
+#. item "Other/Hardware" text "Name"
+#. <space />
+#. <key key="shop" value="paint" />
+#. item "Other/Paint" text "Name"
+#. <key key="shop" value="furniture" />
+#. item "Other/Furniture" text "Name"
+#. <space />
+#. <key key="shop" value="kitchen" />
+#. item "Other/Kitchen" text "Name"
+#. <space />
+#. <key key="shop" value="curtain" />
+#. item "Other/Curtain" text "Name"
+#. <space />
+#. <key key="shop" value="frame" />
+#. item "Other/Frame" text "Name"
+#. <key key="shop" value="stationery" />
+#. item "Other/Stationery" text "Name"
+#. <space />
+#. <key key="shop" value="copyshop" />
+#. item "Other/Copyshop" text "Name"
+#. <key key="shop" value="books" />
+#. item "Other/Book Store" text "Name"
+#. <key key="shop" value="travel_agency" />
+#. item "Other/Travel Agency" text "Name"
+#. <space />
+#. <key key="shop" value="musical_instrument" />
+#. item "Other/Musical Instrument" text "Name"
+#. <key key="shop" value="toys" />
+#. item "Other/Toys" text "Name"
+#. <space />
+#. <key key="shop" value="variety_store" />
+#. item "Other/Variety Store" text "Name"
 #. <space />
 #. <key key="boundary" value="national" />
@@ -7195,4 +7244,7 @@
 #. item "Land use/Vineyard" text "Name"
 #. <space />
+#. <key key="landuse" value="greenhouse_horticulture" />
+#. item "Land use/Greenhouse Horticulture" text "Name"
+#. <space />
 #. <key key="landuse" value="allotments" />
 #. item "Land use/Allotments" text "Name"
@@ -7229,4 +7281,7 @@
 #. <key key="landuse" value="industrial" />
 #. item "Land use/Industrial" text "Name"
+#. <space />
+#. <key key="landuse" value="garages" />
+#. item "Land use/Garages" text "Name"
 #. <space />
 #. <key key="landuse" value="railway" />
@@ -7304,136 +7359,140 @@
 #: build/trans_presets.java:1475 build/trans_presets.java:1491
 #: build/trans_presets.java:1500 build/trans_presets.java:1510
-#: build/trans_presets.java:1519 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1557
-#: build/trans_presets.java:1568 build/trans_presets.java:1578
-#: build/trans_presets.java:1588 build/trans_presets.java:1608
-#: build/trans_presets.java:1620 build/trans_presets.java:1631
-#: build/trans_presets.java:1651 build/trans_presets.java:1666
-#: build/trans_presets.java:1674 build/trans_presets.java:1731
-#: build/trans_presets.java:1748 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1800
-#: build/trans_presets.java:1817 build/trans_presets.java:1834
-#: build/trans_presets.java:1852 build/trans_presets.java:1874
-#: build/trans_presets.java:1893 build/trans_presets.java:1914
-#: build/trans_presets.java:1933 build/trans_presets.java:1950
-#: build/trans_presets.java:1969 build/trans_presets.java:1987
-#: build/trans_presets.java:2004 build/trans_presets.java:2021
-#: build/trans_presets.java:2037 build/trans_presets.java:2044
+#: build/trans_presets.java:1519 build/trans_presets.java:1543
+#: build/trans_presets.java:1551 build/trans_presets.java:1558
+#: build/trans_presets.java:1569 build/trans_presets.java:1579
+#: build/trans_presets.java:1589 build/trans_presets.java:1609
+#: build/trans_presets.java:1621 build/trans_presets.java:1632
+#: build/trans_presets.java:1652 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1732
+#: build/trans_presets.java:1749 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1818 build/trans_presets.java:1835
+#: build/trans_presets.java:1853 build/trans_presets.java:1875
+#: build/trans_presets.java:1894 build/trans_presets.java:1915
+#: build/trans_presets.java:1934 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1988
+#: build/trans_presets.java:2005 build/trans_presets.java:2022
+#: build/trans_presets.java:2038 build/trans_presets.java:2045
 #: build/trans_presets.java:2053 build/trans_presets.java:2060
-#: build/trans_presets.java:2067 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2094 build/trans_presets.java:2103
-#: build/trans_presets.java:2110 build/trans_presets.java:2127
-#: build/trans_presets.java:2135 build/trans_presets.java:2154
-#: build/trans_presets.java:2164 build/trans_presets.java:2176
-#: build/trans_presets.java:2186 build/trans_presets.java:2192
-#: build/trans_presets.java:2200 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2219
-#: build/trans_presets.java:2225 build/trans_presets.java:2230
-#: build/trans_presets.java:2235 build/trans_presets.java:2240
-#: build/trans_presets.java:2247 build/trans_presets.java:2253
-#: build/trans_presets.java:2258 build/trans_presets.java:2267
-#: build/trans_presets.java:2279 build/trans_presets.java:2288
-#: build/trans_presets.java:2297 build/trans_presets.java:2306
-#: build/trans_presets.java:2315 build/trans_presets.java:2321
-#: build/trans_presets.java:2329 build/trans_presets.java:2335
-#: build/trans_presets.java:2341 build/trans_presets.java:2347
-#: build/trans_presets.java:2353 build/trans_presets.java:2359
-#: build/trans_presets.java:2365 build/trans_presets.java:2371
-#: build/trans_presets.java:2377 build/trans_presets.java:2383
-#: build/trans_presets.java:2389 build/trans_presets.java:2395
-#: build/trans_presets.java:2401 build/trans_presets.java:2407
-#: build/trans_presets.java:2414 build/trans_presets.java:2423
-#: build/trans_presets.java:2431 build/trans_presets.java:2437
-#: build/trans_presets.java:2443 build/trans_presets.java:2449
-#: build/trans_presets.java:2455 build/trans_presets.java:2461
-#: build/trans_presets.java:2467 build/trans_presets.java:2473
-#: build/trans_presets.java:2479 build/trans_presets.java:2485
-#: build/trans_presets.java:2491 build/trans_presets.java:2497
-#: build/trans_presets.java:2503 build/trans_presets.java:2509
-#: build/trans_presets.java:2515 build/trans_presets.java:2521
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2545
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2598 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2617
-#: build/trans_presets.java:2624 build/trans_presets.java:2632
-#: build/trans_presets.java:2639 build/trans_presets.java:2645
-#: build/trans_presets.java:2653 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2688
-#: build/trans_presets.java:2698 build/trans_presets.java:2705
-#: build/trans_presets.java:2712 build/trans_presets.java:2719
-#: build/trans_presets.java:2727 build/trans_presets.java:2737
-#: build/trans_presets.java:2742 build/trans_presets.java:2754
-#: build/trans_presets.java:2761 build/trans_presets.java:2766
+#: build/trans_presets.java:2077 build/trans_presets.java:2085
+#: build/trans_presets.java:2101 build/trans_presets.java:2111
+#: build/trans_presets.java:2123 build/trans_presets.java:2133
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2162
+#: build/trans_presets.java:2172 build/trans_presets.java:2177
+#: build/trans_presets.java:2185 build/trans_presets.java:2192
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2216 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2237
+#: build/trans_presets.java:2247 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2272
+#: build/trans_presets.java:2280 build/trans_presets.java:2287
+#: build/trans_presets.java:2294 build/trans_presets.java:2302
+#: build/trans_presets.java:2309 build/trans_presets.java:2315
+#: build/trans_presets.java:2323 build/trans_presets.java:2329
+#: build/trans_presets.java:2335 build/trans_presets.java:2341
+#: build/trans_presets.java:2348 build/trans_presets.java:2358
+#: build/trans_presets.java:2364 build/trans_presets.java:2372
+#: build/trans_presets.java:2380 build/trans_presets.java:2388
+#: build/trans_presets.java:2415 build/trans_presets.java:2492
+#: build/trans_presets.java:2509 build/trans_presets.java:2524
+#: build/trans_presets.java:2533 build/trans_presets.java:2542
+#: build/trans_presets.java:2551 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2574
+#: build/trans_presets.java:2580 build/trans_presets.java:2586
+#: build/trans_presets.java:2592 build/trans_presets.java:2598
+#: build/trans_presets.java:2604 build/trans_presets.java:2610
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2659
+#: build/trans_presets.java:2668 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2694 build/trans_presets.java:2700
+#: build/trans_presets.java:2706 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2732 build/trans_presets.java:2741
+#: build/trans_presets.java:2748 build/trans_presets.java:2754
+#: build/trans_presets.java:2760 build/trans_presets.java:2766
 #: build/trans_presets.java:2772 build/trans_presets.java:2778
-#: build/trans_presets.java:2785 build/trans_presets.java:2802
-#: build/trans_presets.java:2808 build/trans_presets.java:2815
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2850
-#: build/trans_presets.java:2857 build/trans_presets.java:2973
-#: build/trans_presets.java:2980 build/trans_presets.java:2993
-#: build/trans_presets.java:3000 build/trans_presets.java:3007
-#: build/trans_presets.java:3014 build/trans_presets.java:3021
-#: build/trans_presets.java:3028 build/trans_presets.java:3036
-#: build/trans_presets.java:3045 build/trans_presets.java:3054
-#: build/trans_presets.java:3063 build/trans_presets.java:3070
-#: build/trans_presets.java:3077 build/trans_presets.java:3083
-#: build/trans_presets.java:3091 build/trans_presets.java:3097
-#: build/trans_presets.java:3103 build/trans_presets.java:3111
-#: build/trans_presets.java:3120 build/trans_presets.java:3129
-#: build/trans_presets.java:3139 build/trans_presets.java:3148
-#: build/trans_presets.java:3156 build/trans_presets.java:3164
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3191
-#: build/trans_presets.java:3198 build/trans_presets.java:3204
-#: build/trans_presets.java:3212 build/trans_presets.java:3220
-#: build/trans_presets.java:3226 build/trans_presets.java:3234
-#: build/trans_presets.java:3243 build/trans_presets.java:3250
-#: build/trans_presets.java:3256 build/trans_presets.java:3264
-#: build/trans_presets.java:3271 build/trans_presets.java:3278
-#: build/trans_presets.java:3286 build/trans_presets.java:3294
-#: build/trans_presets.java:3300 build/trans_presets.java:3308
-#: build/trans_presets.java:3317 build/trans_presets.java:3326
-#: build/trans_presets.java:3333 build/trans_presets.java:3341
-#: build/trans_presets.java:3348 build/trans_presets.java:3354
-#: build/trans_presets.java:3362 build/trans_presets.java:3369
-#: build/trans_presets.java:3377 build/trans_presets.java:3403
-#: build/trans_presets.java:3412 build/trans_presets.java:3427
-#: build/trans_presets.java:3433 build/trans_presets.java:3441
-#: build/trans_presets.java:3448 build/trans_presets.java:3475
-#: build/trans_presets.java:3486 build/trans_presets.java:3492
-#: build/trans_presets.java:3498 build/trans_presets.java:3504
-#: build/trans_presets.java:3510 build/trans_presets.java:3518
-#: build/trans_presets.java:3525 build/trans_presets.java:3532
-#: build/trans_presets.java:3539 build/trans_presets.java:3546
-#: build/trans_presets.java:3554 build/trans_presets.java:3562
-#: build/trans_presets.java:3570 build/trans_presets.java:3577
-#: build/trans_presets.java:3584 build/trans_presets.java:3593
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3618 build/trans_presets.java:3626
-#: build/trans_presets.java:3635 build/trans_presets.java:3643
-#: build/trans_presets.java:3653 build/trans_presets.java:3663
-#: build/trans_presets.java:3672 build/trans_presets.java:3678
-#: build/trans_presets.java:3684 build/trans_presets.java:3690
-#: build/trans_presets.java:3695 build/trans_presets.java:3701
-#: build/trans_presets.java:3711 build/trans_presets.java:3717
-#: build/trans_presets.java:3723 build/trans_presets.java:3729
-#: build/trans_presets.java:3735 build/trans_presets.java:3741
-#: build/trans_presets.java:3747 build/trans_presets.java:3754
-#: build/trans_presets.java:3760 build/trans_presets.java:3765
-#: build/trans_presets.java:3772 build/trans_presets.java:3779
-#: build/trans_presets.java:3785 build/trans_presets.java:3794
-#: build/trans_presets.java:3802 build/trans_presets.java:3808
-#: build/trans_presets.java:3814 build/trans_presets.java:3821
-#: build/trans_presets.java:3827 build/trans_presets.java:3834
-#: build/trans_presets.java:3840 build/trans_presets.java:3846
-#: build/trans_presets.java:3852 build/trans_presets.java:3858
-#: build/trans_presets.java:3905 build/trans_presets.java:3919
-#: build/trans_presets.java:3938 build/trans_presets.java:3952
-#: build/trans_presets.java:3975
+#: build/trans_presets.java:2784 build/trans_presets.java:2790
+#: build/trans_presets.java:2796 build/trans_presets.java:2802
+#: build/trans_presets.java:2808 build/trans_presets.java:2816
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2841
+#: build/trans_presets.java:2847 build/trans_presets.java:2860
+#: build/trans_presets.java:2875 build/trans_presets.java:2882
+#: build/trans_presets.java:2890 build/trans_presets.java:2895
+#: build/trans_presets.java:2910 build/trans_presets.java:2917
+#: build/trans_presets.java:2929 build/trans_presets.java:2939
+#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:3002
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3030 build/trans_presets.java:3037
+#: build/trans_presets.java:3093 build/trans_presets.java:3099
+#: build/trans_presets.java:3107 build/trans_presets.java:3114
+#: build/trans_presets.java:3120 build/trans_presets.java:3126
+#: build/trans_presets.java:3132 build/trans_presets.java:3137
+#: build/trans_presets.java:3142 build/trans_presets.java:3147
+#: build/trans_presets.java:3156 build/trans_presets.java:3163
+#: build/trans_presets.java:3170 build/trans_presets.java:3178
+#: build/trans_presets.java:3185 build/trans_presets.java:3193
+#: build/trans_presets.java:3202 build/trans_presets.java:3210
+#: build/trans_presets.java:3219 build/trans_presets.java:3228
+#: build/trans_presets.java:3235 build/trans_presets.java:3243
+#: build/trans_presets.java:3249 build/trans_presets.java:3257
+#: build/trans_presets.java:3265 build/trans_presets.java:3272
+#: build/trans_presets.java:3279 build/trans_presets.java:3285
+#: build/trans_presets.java:3293 build/trans_presets.java:3300
+#: build/trans_presets.java:3306 build/trans_presets.java:3314
+#: build/trans_presets.java:3323 build/trans_presets.java:3329
+#: build/trans_presets.java:3337 build/trans_presets.java:3346
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3368 build/trans_presets.java:3377
+#: build/trans_presets.java:3393 build/trans_presets.java:3402
+#: build/trans_presets.java:3410 build/trans_presets.java:3416
+#: build/trans_presets.java:3422 build/trans_presets.java:3430
+#: build/trans_presets.java:3439 build/trans_presets.java:3448
+#: build/trans_presets.java:3455 build/trans_presets.java:3463
+#: build/trans_presets.java:3470 build/trans_presets.java:3478
+#: build/trans_presets.java:3486 build/trans_presets.java:3494
+#: build/trans_presets.java:3503 build/trans_presets.java:3512
+#: build/trans_presets.java:3520 build/trans_presets.java:3528
+#: build/trans_presets.java:3535 build/trans_presets.java:3542
+#: build/trans_presets.java:3550 build/trans_presets.java:3557
+#: build/trans_presets.java:3565 build/trans_presets.java:3592
+#: build/trans_presets.java:3598 build/trans_presets.java:3604
+#: build/trans_presets.java:3610 build/trans_presets.java:3616
+#: build/trans_presets.java:3624 build/trans_presets.java:3631
+#: build/trans_presets.java:3638 build/trans_presets.java:3645
+#: build/trans_presets.java:3652 build/trans_presets.java:3660
+#: build/trans_presets.java:3668 build/trans_presets.java:3676
+#: build/trans_presets.java:3683 build/trans_presets.java:3690
+#: build/trans_presets.java:3699 build/trans_presets.java:3708
+#: build/trans_presets.java:3716 build/trans_presets.java:3724
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3749 build/trans_presets.java:3759
+#: build/trans_presets.java:3769 build/trans_presets.java:3778
+#: build/trans_presets.java:3784 build/trans_presets.java:3790
+#: build/trans_presets.java:3796 build/trans_presets.java:3801
+#: build/trans_presets.java:3807 build/trans_presets.java:3817
+#: build/trans_presets.java:3823 build/trans_presets.java:3829
+#: build/trans_presets.java:3835 build/trans_presets.java:3842
+#: build/trans_presets.java:3849 build/trans_presets.java:3855
+#: build/trans_presets.java:3861 build/trans_presets.java:3868
+#: build/trans_presets.java:3874 build/trans_presets.java:3879
+#: build/trans_presets.java:3886 build/trans_presets.java:3893
+#: build/trans_presets.java:3899 build/trans_presets.java:3908
+#: build/trans_presets.java:3916 build/trans_presets.java:3922
+#: build/trans_presets.java:3928 build/trans_presets.java:3935
+#: build/trans_presets.java:3943 build/trans_presets.java:3949
+#: build/trans_presets.java:3956 build/trans_presets.java:3962
+#: build/trans_presets.java:3968 build/trans_presets.java:3974
+#: build/trans_presets.java:3980 build/trans_presets.java:4027
+#: build/trans_presets.java:4041 build/trans_presets.java:4060
+#: build/trans_presets.java:4074 build/trans_presets.java:4097
 msgid "Name"
 msgstr "Navn"
@@ -7856,5 +7915,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:142
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -8657,10 +8716,11 @@
 #. item "Car/Parking" combo "Type"
 #. item "Motorcycle/Parking" combo "Type"
-#. item "Man-Made/Buildings/Studio" combo "Type"
-#. item "Man Made/Pipeline" combo "Type"
-#. item "Man Made/Surveillance" combo "Type"
+#. item "Culture/Recording Studio" combo "Type"
+#. item "Sport (Ball)/Volleyball" combo "Type"
+#. item "Sport (Ball)/Beachvolleyball" combo "Type"
+#. item "Man Made/Man Made/Pipeline" combo "Type"
+#. item "Man Made/Man Made/Surveillance" combo "Type"
 #. <key key="power" value="generator" />
-#. item "Man Made/Power Generator" combo "Type"
-#. item "Man Made/Power Tower" combo "Type"
+#. item "Power/Power Generator" combo "Type"
 #. item "Nature/Tree" text "Type"
 #. item "Nature/Wood" combo "Type"
@@ -8670,9 +8730,9 @@
 #: build/trans_presets.java:720 build/trans_presets.java:729
 #: build/trans_presets.java:1121 build/trans_presets.java:1400
-#: build/trans_presets.java:1512 build/trans_presets.java:2655
-#: build/trans_presets.java:2793 build/trans_presets.java:2840
-#: build/trans_presets.java:2849 build/trans_presets.java:2875
-#: build/trans_presets.java:3654 build/trans_presets.java:3664
-#: build/trans_presets.java:3673
+#: build/trans_presets.java:1512 build/trans_presets.java:2249
+#: build/trans_presets.java:2734 build/trans_presets.java:2743
+#: build/trans_presets.java:2903 build/trans_presets.java:3019
+#: build/trans_presets.java:3029 build/trans_presets.java:3760
+#: build/trans_presets.java:3770 build/trans_presets.java:3779
 msgid "Type"
 msgstr "Type"
@@ -8700,7 +8760,7 @@
 #: build/trans_presets.java:720 build/trans_presets.java:1332
 #: build/trans_presets.java:1405 build/trans_presets.java:1406
-#: build/trans_presets.java:1407 build/trans_presets.java:2270
-#: build/trans_presets.java:2964 build/trans_presets.java:2965
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:1407 build/trans_presets.java:2165
+#: build/trans_presets.java:2499 build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "unknown"
 msgstr "ukjent"
@@ -9995,5 +10055,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
-#: build/trans_presets.java:3955
+#: build/trans_presets.java:4077
 msgid "Description"
 msgstr "Beskrivelse"
@@ -10910,5 +10970,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:102
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10916,8 +10976,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:105
-#, java-format
-msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:107
+#, java-format
+msgid ""
+"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
+"{3}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:110
+#, java-format
+msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
 msgstr ""
 
@@ -11772,4 +11838,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:174
 msgid "None"
 msgstr "Ingen"
@@ -11832,6 +11899,6 @@
 #: build/trans_presets.java:938 build/trans_presets.java:950
 #: build/trans_presets.java:960 build/trans_presets.java:969
-#: build/trans_presets.java:978 build/trans_presets.java:1537
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:978 build/trans_presets.java:1538
+#: build/trans_presets.java:1611
 msgid "Bicycle"
 msgstr "Sykkel"
@@ -12449,4 +12516,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:73
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12986,5 +13054,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380
 #, java-format
 msgid ""
@@ -12993,49 +13061,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:510
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Mer informasjon om denne funksjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:547
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
+msgid "Available roles"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
-msgid "Available roles"
+msgid "role"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
-msgid "role"
+msgid "count"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
 msgid "Optional Attributes:"
 msgstr "Valgfrie attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:720
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13045,15 +13113,15 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:839
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:880
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:976
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13063,22 +13131,22 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:979
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:981
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1079
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13107,9 +13175,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:281
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:298
 msgid "Search in tags"
 msgstr ""
@@ -13380,4 +13448,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:35
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:89
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:74
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
@@ -13846,5 +13915,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
-#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76
+#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:80
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286
 #, java-format
@@ -15025,4 +15094,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:350
+msgid "Failed to load XML schema."
+msgstr ""
+
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:43
+msgid "Columbus V-900 CSV Files"
+msgstr ""
+
+#. *
+#. * Ui elements for each flag.
+#.
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:61
+#, fuzzy
+msgid "Show summary after import"
+msgstr "slett data etter import"
+
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:62
+#, fuzzy
+msgid "Do not zoom after import"
+msgstr "slett data etter import"
+
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:63
+msgid "Ignore hdop/vdop/pdop entries"
+msgstr ""
+
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:64
+msgid "Warn on missing audio files"
+msgstr ""
+
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:65
+msgid "Warn on conversion errors"
+msgstr ""
+
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:171
+#, fuzzy
+msgid "Error in line "
+msgstr "Feil i fil {0}"
+
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389
+#, fuzzy
+msgid "Missing audio file"
+msgstr "Fotgjengerport"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15082,5 +15194,5 @@
 #, fuzzy
 msgid "Download Track"
-msgstr "Last ned område"
+msgstr "Laster ned data"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:213
@@ -15203,4 +15315,88 @@
 msgstr "Last opp spor til openstreetmap.org"
 
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationMapMode.java:38
+msgid "Shows elevation profile"
+msgstr ""
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java:217
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java:224
+#, fuzzy
+msgid "Unknown"
+msgstr "ukjent"
+
+#. Show name of profile in title
+#. no elevation data, -> switch back to empty view
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:98
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:289
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:314
+#, fuzzy
+msgid "Elevation Profile"
+msgstr "Høyde"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:99
+#, fuzzy
+msgid "Open the elevation profile window."
+msgstr "Åpne valideringsvindu"
+
+#. first row: Headlines with bold font
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:136
+#, fuzzy
+msgid "Min"
+msgstr "Marina"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:139
+msgid "Avrg"
+msgstr ""
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:142
+#, fuzzy
+msgid "Max"
+msgstr "Kart"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:145
+#, fuzzy
+msgid "Dist"
+msgstr "Tannlege"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:148
+#, fuzzy
+msgid "Gain"
+msgstr "jain"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:151
+#, fuzzy
+msgid "Time"
+msgstr "bilde"
+
+#. Geoid
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:170
+#, fuzzy
+msgid "Geoid"
+msgstr "Rutenett"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:186
+#, fuzzy
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:196
+#, fuzzy
+msgid "Fixed value"
+msgstr "Tidligere verdi"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java:118
+msgid "Elevation profile for track '"
+msgstr ""
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java:120
+#, fuzzy
+msgid "Elevation profile"
+msgstr "Høyde"
+
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfilePanel.java:200
+#, fuzzy
+msgid "(No elevation data)"
+msgstr "Feil ved sletting av data."
+
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
 msgid "Layer Properties"
@@ -15272,5 +15468,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1203
-#: build/trans_presets.java:3877
+#: build/trans_presets.java:3999
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -15710,8 +15906,6 @@
 msgstr ""
 
-#. group "Man-Made/Buildings"
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2590
 msgid "Buildings"
 msgstr "Bygninger"
@@ -15947,12 +16141,12 @@
 #. <rule>
 #. <condition k="natural" v="coastline"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="misc/coastline.png"/>
 #. color water
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2793 build/trans_style.java:1079
-#: build/trans_style.java:1096 build/trans_style.java:1112
-#: build/trans_style.java:1119 build/trans_style.java:3802
-#: build/trans_style.java:3810
+#: build/trans_presets.java:2903 build/trans_style.java:1080
+#: build/trans_style.java:1097 build/trans_style.java:1113
+#: build/trans_style.java:1120 build/trans_style.java:3858
+#: build/trans_style.java:3866
 msgid "water"
 msgstr "vann"
@@ -16013,6 +16207,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4702 build/trans_style.java:4709
-#: build/trans_style.java:4716 build/trans_style.java:4723
+#: build/trans_style.java:4750 build/trans_style.java:4757
+#: build/trans_style.java:4764 build/trans_style.java:4771
 msgid "address"
 msgstr "adresse"
@@ -16663,5 +16857,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:90
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:134
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:61
 msgid "No data loaded."
 msgstr "Ingen data lastet inn."
@@ -16712,4 +16906,45 @@
 msgstr "Fant ikke GPX lag"
 
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:63
+#, fuzzy, java-format
+msgid "Current projection is set to {0}"
+msgstr "Bytt til kartprojeksjonen {0}."
+
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:65
+msgid ""
+"\n"
+"Please adjust WMS layer manually by using known exact objects/traces/... "
+"before starting to map"
+msgstr ""
+
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:90
+#, fuzzy
+msgid "EPSG31287"
+msgstr "EPSG:4326 (lengde- og breddegrad)"
+
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:96
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:109
+#, fuzzy, java-format
+msgid "set {0}"
+msgstr "Flytt {0}"
+
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:98
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:111
+#, fuzzy, java-format
+msgid "set projection from {0} to {1}"
+msgstr "Bytt til kartprojeksjonen {0}."
+
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:59
+msgid "dx"
+msgstr ""
+
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:63
+msgid "dy"
+msgstr ""
+
+#: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:142
+msgid " - Bessel 1841 in Lambert Conformal Conic"
+msgstr ""
+
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:129
 msgid "External tool error"
@@ -16745,5 +16980,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:34
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -16904,7 +17139,6 @@
 #: ../plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java:16
 #: ../plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java:18
-#, fuzzy
 msgid "Add EGPX layer"
-msgstr "Legg til nytt lag"
+msgstr ""
 
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
@@ -17000,4 +17234,40 @@
 msgid "Load set of images as a new layer."
 msgstr "Last inn bildesett som et nyt lag."
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:24
+msgid "Import vector graphics"
+msgstr ""
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:32
+#, fuzzy
+msgid "Scale:"
+msgstr "målestokk"
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:35
+msgid "unit(s) = "
+msgstr ""
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:37
+msgid "m"
+msgstr ""
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:52
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
+#, fuzzy
+msgid "Import..."
+msgstr "Importer"
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:52
+msgid "Import vector graphics."
+msgstr ""
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:81
+msgid "SVG Drawings (*.svg)"
+msgstr ""
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:136
+#, fuzzy
+msgid "Importing..."
+msgstr "Importer"
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:56
@@ -17446,5 +17716,4 @@
 
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:81
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:94
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr "En av de valgte linjene er allerede del av en annen multipolygon."
@@ -17452,22 +17721,30 @@
 #. Commit
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:118
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:51
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:160
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:46
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:21
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:47
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:120
-msgid "Multipolygon must consist only of closed ways."
-msgstr "Multipolygon må bestå kun av lukkede linjer."
-
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:140
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:69
 msgid "You must select at least two ways."
 msgstr "Velg minst to linjer."
+
+#: ../plugins/multipoly/src/multipoly/Multipolygon.java:121
+#, java-format
+msgid "Cannot add a way with only {0} nodes."
+msgstr ""
+
+#: ../plugins/multipoly/src/multipoly/Multipolygon.java:166
+msgid "Each node must connect exactly 2 ways"
+msgstr ""
+
+#: ../plugins/multipoly/src/multipoly/Multipolygon.java:198
+msgid "There is an intersection between ways."
+msgstr ""
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
@@ -17483,5 +17760,5 @@
 msgstr "Vis tema i  OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:105
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:106
 msgid ""
 "<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A "
@@ -17493,7 +17770,11 @@
 "nye tjeneren? (Anbefalt)</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
 msgid "Switch to new openstreetbugs server?"
 msgstr "Bytte til ny openstreetbugs-tjener?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:193
+msgid "Unknown Host: %s - Possibly there is no connection to the Internet."
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -17669,4 +17950,133 @@
 msgstr "Firefox-programfil"
 
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:146
+#, fuzzy
+msgid "Load file..."
+msgstr "Last Kartbilde"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:147
+#, fuzzy
+msgid "Place"
+msgstr "Steder"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:149
+#, fuzzy
+msgid "Show target"
+msgstr "Synlig område"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:156
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:162
+#, fuzzy
+msgid "Take X and Y from selected node"
+msgstr "Lag en sirkel fra tre valgte noder."
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:166
+#, fuzzy
+msgid "Load file"
+msgstr "Last Kartbilde"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:171
+#, fuzzy
+msgid "Bind to coordinates"
+msgstr "Koodinater med null: "
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:174
+#, fuzzy
+msgid "Projection:"
+msgstr "Kartprojeksjon"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:179
+msgid "Bottom left (min) corner:"
+msgstr ""
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:181
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:199
+msgid "PDF X and Y"
+msgstr ""
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:183
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:201
+msgid "East and North"
+msgstr ""
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:197
+msgid "Top right (max) corner:"
+msgstr ""
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:238
+#, fuzzy
+msgid "Loading..."
+msgstr "Laster opp …"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:252
+msgid "PDF file preview"
+msgstr ""
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:253
+#, fuzzy
+msgid "Loaded"
+msgstr "Last Kartbilde"
+
+#. rebuild layer with latest projection
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:269
+#, fuzzy
+msgid "Imported PDF: "
+msgstr "Importerte bilder"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:334
+#, fuzzy
+msgid "Please select exactly one node."
+msgstr "Velg minst én node eller linje."
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:355
+#, fuzzy
+msgid "PDF files"
+msgstr "GPX filer"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:381
+#, fuzzy
+msgid "OSM files"
+msgstr "Lagre OSM-fil"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:422
+#, fuzzy
+msgid "File not found."
+msgstr "Fant ikke fila"
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:428
+msgid "Could not parse file. Not a PDF file?"
+msgstr ""
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:451
+#, fuzzy
+msgid "Please set a projection."
+msgstr "Velg en verdi."
+
+#: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:471
+#, fuzzy
+msgid "Could not parse numbers. Please check."
+msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input."
+
+#: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:38
+#: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:41
+#, fuzzy
+msgid "Import PDF file"
+msgstr "Eksporter GPX fil"
+
+#: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:39
+#, fuzzy
+msgid "Import PDF file."
+msgstr "Eksporter GPX fil"
+
+#: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:56
+#, fuzzy
+msgid "Import PDF"
+msgstr "Importer"
+
+#: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:21
+#, fuzzy
+msgid "Import PDf file"
+msgstr "Eksporter GPX fil"
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
@@ -17913,5 +18323,5 @@
 #. group "Public Transport"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1561
 msgid "Public Transport"
 msgstr "Offentlig transport"
@@ -18276,9 +18686,9 @@
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:272
-#, fuzzy, java-format
+#, java-format
 msgid "Simplify Area (remove {0} node)"
 msgid_plural "Simplify Area (remove {0} nodes)"
-msgstr[0] "Forenkle linje (fjern {0} node)"
-msgstr[1] "Forenkle linjer (fjern {0} noder)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
@@ -18368,27 +18778,22 @@
 
 #: ../plugins/smed/plugs/oseam/src/oseam/OSeaM.java:28
-#, fuzzy
 msgid "mapping seamarks"
-msgstr "Overlappende områder"
+msgstr ""
 
 #: ../plugins/smed/plugs/oseam/src/oseam/OSeaM.java:31
-#, fuzzy
 msgid "Seamarks"
-msgstr "Supermarked"
+msgstr ""
 
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:223
-#, fuzzy
 msgid "Load"
-msgstr "Land"
+msgstr ""
 
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:274
-#, fuzzy
 msgid "invisible"
-msgstr "Deaktiver"
+msgstr ""
 
 #: ../plugins/smed/src/smed/tabs/SmedTabAction.java:35
-#, fuzzy
 msgid "SeaMap Editor"
-msgstr "Skilletegn"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -19552,7 +19957,8 @@
 #. * Other messages
 #. item "Motorcycle/Motorcycle Dealer" text "Other"
+#. group "Other"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1530 build/trans_presets.java:3387
 msgid "Other"
 msgstr "Annet"
@@ -19768,5 +20174,5 @@
 #. item "Relations/Multipolygon"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3898
+#: build/trans_presets.java:4020
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20289,5 +20695,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4681
+#: build/trans_style.java:4729
 msgid "area"
 msgstr "område"
@@ -20305,17 +20711,17 @@
 msgstr "Sjekker om en linje har endepunkt nesten inntil annen  linje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:127
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:124
 msgid "Way end node near other highway"
 msgstr "Sluttnode nær annen ferdselsvei"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:147
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:144
 msgid "Way end node near other way"
 msgstr "Sluttnode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:165
 msgid "Way node near other way"
 msgstr "Linjenode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:186
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:183
 msgid "Connected way end node near other way"
 msgstr "Knyttet endenode nær annen linje"
@@ -20432,130 +20838,143 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:100
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:111
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:100
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:111
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:120
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:132
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:120
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:132
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:128
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Play/Pause"
 msgstr "Spill/Pause"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:128
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:135
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:147
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "Backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:135
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:147
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:142
-msgid "Jump To"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:142
-msgid "jumps to the entered gps time"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
-msgid "please enter GPS timecode"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:160
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:153
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:154
 msgid "Forward"
 msgstr "Spill av"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:160
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:153
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:161
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:162
 msgid "Faster"
 msgstr "Raskere"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:161
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:176
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "Slower"
 msgstr "Saktere"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:176
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:184
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:177
+msgid "Jump To"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:177
+msgid "jumps to the entered gps time"
+msgstr ""
+
+#. TODO here we should show the GPS time range to the user
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:192
+#, fuzzy
+msgid "Jump to"
+msgstr "Gå dit"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:212
 msgid "Loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:184
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:212
 msgid "loops n sec around current position"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:213
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:141
+msgid "loop"
+msgstr ""
+
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:222
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:222
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:233
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:233
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:213
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:217
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:241
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:213
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:241
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:217
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:228
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:256
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:224
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:228
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:252
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:256
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:224
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:252
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:237
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:265
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:273
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:281
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20572,8 +20991,4 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:138
 msgid "play"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:141
-msgid "loop"
 msgstr ""
 
@@ -21137,5 +21552,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3538
+#: build/specialmessages.java:15 build/trans_style.java:3578
 msgid "forest"
 msgstr "skog"
@@ -21461,11 +21876,18 @@
 "innstillinger (Rart men sant :-)"
 
+#. Plugin ColumbusCSV
+#: build/trans_plugins.java:12
+msgid ""
+"Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
+"into a GPX layer."
+msgstr ""
+
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:14
 msgid "Create a grid of ways."
 msgstr "Lag et rutenett med linjer."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:16
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21473,10 +21895,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:18
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Lar deg importere forskjellige dataformater direkte i JOSM."
 
 #. Plugin DirectDownload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:20
 #, fuzzy
 msgid "Download your GPX tracks from openstreetmap.org"
@@ -21484,5 +21906,5 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21493,15 +21915,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Dupliser linjer med parallell avstand"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21510,27 +21932,38 @@
 "Lar deg anonymisere tidsstempler og raskt slette deler av store GPX-spor."
 
+#. Plugin ElevationProfile
+#: build/trans_plugins.java:30
+msgid "Shows the elevation profile and some statistical data of a GPX track."
+msgstr ""
+
+#. Plugin epsg31287
+#: build/trans_plugins.java:32
+msgid ""
+"sets current projection to EPSG:31287 - Bessel 1841 in Lambert Conformal "
+"Conic. For use with WMS plugin to load geoimage.at WMS, see link for details"
+msgstr ""
+
 #. Plugin globalsat
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:36
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM"
 
 #. Plugin gpxfilter
-#: build/trans_plugins.java:32
-#, fuzzy
+#: build/trans_plugins.java:38
 msgid "Allows to filter out unnececary GPS tracks"
-msgstr "Tillat opplastning av GPS-spor"
+msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:40
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:42
 msgid "Provide a background layer that displays a map grid"
 msgstr "Bakgrunnslag som viser rutenettet i kartet"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:44
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21543,20 +21976,25 @@
 
 #. Plugin ImportImagePlugin
-#: build/trans_plugins.java:40 build/trans_plugins.java:42
+#: build/trans_plugins.java:46 build/trans_plugins.java:48
 msgid "Plugin for importing spatial referenced images"
 msgstr ""
 
+#. Plugin importvec
+#: build/trans_plugins.java:50
+msgid "Import vector graphics (SVG)"
+msgstr ""
+
 #. Plugin irsrectify
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Helps vectorizing WMS images."
 msgstr "For vektorisering av  WMS bilder."
 
 #. Plugin livegps
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21566,5 +22004,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21577,15 +22015,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21594,5 +22032,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21605,20 +22043,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid "Displays an OpenLayers background image"
 msgstr "Viser bakgrunnsbildet i et åpent lag"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer tema fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21626,11 +22064,16 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr "Starter visning av SVG bilde av aktuelt skjermutsnitt i FireFox."
 
+#. Plugin pdfimport
+#: build/trans_plugins.java:78
+msgid "Import PDF file and convert to ways."
+msgstr ""
+
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:80
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21639,5 +22082,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:82
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21648,10 +22091,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:84
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:86
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21659,20 +22102,20 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:88
 msgid "Let other applications send commands to JOSM."
 msgstr "La andre program sende kommandoer til JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:90
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:92
 msgid "Use rgis.spb.ru image as overlay"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:94
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21682,5 +22125,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:96
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21691,10 +22134,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:98
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:100
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21703,5 +22146,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:102
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21712,20 +22155,20 @@
 
 #. Plugin smed
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:104
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr ""
 
 #. Plugin surveyor
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:106
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:108
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:110
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21738,15 +22181,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:112
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin toms
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:114
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:116
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21755,5 +22198,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:118
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21762,5 +22205,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:120
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21769,10 +22212,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:122
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:124
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21783,5 +22226,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:126
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21791,5 +22234,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:118
+#: build/trans_plugins.java:128
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21798,20 +22241,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:120
+#: build/trans_plugins.java:130
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:122
+#: build/trans_plugins.java:132
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:124
+#: build/trans_plugins.java:134
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:126
+#: build/trans_plugins.java:136
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21820,5 +22263,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:128
+#: build/trans_plugins.java:138
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21947,12 +22390,14 @@
 #. <key key="aeroway" value="gate" />
 #. item "Airport/Gate" text "Reference"
-#. item "Man Made/Power Station" text "Reference"
+#. item "Power/Power Station" text "Reference"
+#. item "Power/Cable Distribution Cabinet" text "Reference"
 #. item "Relations/Route" text "Reference"
 #: build/trans_presets.java:87 build/trans_presets.java:125
 #: build/trans_presets.java:146 build/trans_presets.java:167
 #: build/trans_presets.java:207 build/trans_presets.java:228
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1703 build/trans_presets.java:1737
-#: build/trans_presets.java:2859 build/trans_presets.java:3953
+#: build/trans_presets.java:1688 build/trans_presets.java:1696
+#: build/trans_presets.java:1704 build/trans_presets.java:1738
+#: build/trans_presets.java:3039 build/trans_presets.java:3055
+#: build/trans_presets.java:4075
 msgid "Reference"
 msgstr "Veinummer"
@@ -22433,6 +22878,6 @@
 #: build/trans_presets.java:591 build/trans_presets.java:615
 #: build/trans_presets.java:634 build/trans_presets.java:654
-#: build/trans_presets.java:1310 build/trans_presets.java:1598
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1310 build/trans_presets.java:1599
+#: build/trans_presets.java:1644
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
@@ -22533,5 +22978,5 @@
 #: build/trans_presets.java:583 build/trans_presets.java:606
 #: build/trans_presets.java:626 build/trans_presets.java:646
-#: build/trans_presets.java:1308 build/trans_presets.java:2956
+#: build/trans_presets.java:1308 build/trans_presets.java:2485
 msgid "metal"
 msgstr ""
@@ -22544,6 +22989,6 @@
 #: build/trans_presets.java:583 build/trans_presets.java:606
 #: build/trans_presets.java:626 build/trans_presets.java:646
-#: build/trans_presets.java:1308 build/trans_presets.java:2096
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:1308 build/trans_presets.java:2187
+#: build/trans_presets.java:2485
 msgid "wood"
 msgstr "skogsområde"
@@ -22645,5 +23090,5 @@
 #: build/trans_presets.java:606 build/trans_presets.java:626
 #: build/trans_presets.java:646 build/trans_presets.java:1308
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2455
 msgid "ground"
 msgstr "jord"
@@ -22780,5 +23225,5 @@
 #. <rule>
 #. <condition k="traffic_calming" v="chicane"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/chicane.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22804,5 +23249,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:391 build/trans_style.java:984
+#: build/trans_presets.java:391 build/trans_style.java:985
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -22834,5 +23279,7 @@
 #. item "Highways/Streets/Road Restrictions" combo "Access"
 #. item "Ways/Track" combo "Access"
+#. item "Leisure/Sauna" combo "Access"
 #: build/trans_presets.java:404 build/trans_presets.java:494
+#: build/trans_presets.java:2165
 msgid "Access"
 msgstr "Adkomst"
@@ -22858,43 +23305,44 @@
 #: build/trans_presets.java:1525 build/trans_presets.java:1526
 #: build/trans_presets.java:1527 build/trans_presets.java:1528
-#: build/trans_presets.java:1632 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1752
+#: build/trans_presets.java:1529 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
 #: build/trans_presets.java:1753 build/trans_presets.java:1754
-#: build/trans_presets.java:1755 build/trans_presets.java:1770
+#: build/trans_presets.java:1755 build/trans_presets.java:1756
 #: build/trans_presets.java:1771 build/trans_presets.java:1772
-#: build/trans_presets.java:1773 build/trans_presets.java:1786
+#: build/trans_presets.java:1773 build/trans_presets.java:1774
 #: build/trans_presets.java:1787 build/trans_presets.java:1788
-#: build/trans_presets.java:1789 build/trans_presets.java:1803
+#: build/trans_presets.java:1789 build/trans_presets.java:1790
 #: build/trans_presets.java:1804 build/trans_presets.java:1805
-#: build/trans_presets.java:1806 build/trans_presets.java:1821
+#: build/trans_presets.java:1806 build/trans_presets.java:1807
 #: build/trans_presets.java:1822 build/trans_presets.java:1823
-#: build/trans_presets.java:1824 build/trans_presets.java:1838
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
 #: build/trans_presets.java:1839 build/trans_presets.java:1840
-#: build/trans_presets.java:1841 build/trans_presets.java:1855
+#: build/trans_presets.java:1841 build/trans_presets.java:1842
 #: build/trans_presets.java:1856 build/trans_presets.java:1857
-#: build/trans_presets.java:1858 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1878
+#: build/trans_presets.java:1858 build/trans_presets.java:1859
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
 #: build/trans_presets.java:1879 build/trans_presets.java:1880
-#: build/trans_presets.java:1900 build/trans_presets.java:1901
+#: build/trans_presets.java:1881 build/trans_presets.java:1901
 #: build/trans_presets.java:1902 build/trans_presets.java:1903
-#: build/trans_presets.java:1919 build/trans_presets.java:1920
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
 #: build/trans_presets.java:1921 build/trans_presets.java:1922
-#: build/trans_presets.java:1936 build/trans_presets.java:1937
+#: build/trans_presets.java:1923 build/trans_presets.java:1937
 #: build/trans_presets.java:1938 build/trans_presets.java:1939
-#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1940 build/trans_presets.java:1956
 #: build/trans_presets.java:1957 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1975
+#: build/trans_presets.java:1959 build/trans_presets.java:1975
 #: build/trans_presets.java:1976 build/trans_presets.java:1977
-#: build/trans_presets.java:1990 build/trans_presets.java:1991
+#: build/trans_presets.java:1978 build/trans_presets.java:1991
 #: build/trans_presets.java:1992 build/trans_presets.java:1993
-#: build/trans_presets.java:2007 build/trans_presets.java:2008
+#: build/trans_presets.java:1994 build/trans_presets.java:2008
 #: build/trans_presets.java:2009 build/trans_presets.java:2010
-#: build/trans_presets.java:2024 build/trans_presets.java:2025
-#: build/trans_presets.java:2095 build/trans_presets.java:2158
-#: build/trans_presets.java:2168 build/trans_presets.java:2270
-#: build/trans_presets.java:2820 build/trans_presets.java:2898
-#: build/trans_presets.java:2899 build/trans_presets.java:2955
-#: build/trans_presets.java:2964 build/trans_presets.java:2965
-#: build/trans_presets.java:2966 build/trans_presets.java:3440
+#: build/trans_presets.java:2011 build/trans_presets.java:2025
+#: build/trans_presets.java:2026 build/trans_presets.java:2105
+#: build/trans_presets.java:2115 build/trans_presets.java:2165
+#: build/trans_presets.java:2186 build/trans_presets.java:2371
+#: build/trans_presets.java:2426 build/trans_presets.java:2427
+#: build/trans_presets.java:2484 build/trans_presets.java:2499
+#: build/trans_presets.java:2500 build/trans_presets.java:2501
+#: build/trans_presets.java:2922
 msgid "yes"
 msgstr "ja"
@@ -22913,5 +23361,5 @@
 #: build/trans_presets.java:413 build/trans_presets.java:494
 #: build/trans_presets.java:495 build/trans_presets.java:496
-#: build/trans_presets.java:2270 build/trans_style.java:212
+#: build/trans_presets.java:2165 build/trans_style.java:213
 msgid "private"
 msgstr "privat"
@@ -22930,5 +23378,5 @@
 #: build/trans_presets.java:413 build/trans_presets.java:494
 #: build/trans_presets.java:495 build/trans_presets.java:496
-#: build/trans_style.java:219
+#: build/trans_style.java:220
 msgid "destination"
 msgstr "destinasjon"
@@ -22957,6 +23405,6 @@
 #: build/trans_presets.java:412 build/trans_presets.java:413
 #: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:496 build/trans_presets.java:2270
-#: build/trans_style.java:205
+#: build/trans_presets.java:496 build/trans_presets.java:2165
+#: build/trans_style.java:206
 msgid "permissive"
 msgstr "permissive"
@@ -23005,43 +23453,45 @@
 #: build/trans_presets.java:1513 build/trans_presets.java:1525
 #: build/trans_presets.java:1526 build/trans_presets.java:1527
-#: build/trans_presets.java:1528 build/trans_presets.java:1632
+#: build/trans_presets.java:1528 build/trans_presets.java:1529
 #: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1752 build/trans_presets.java:1753
+#: build/trans_presets.java:1635 build/trans_presets.java:1753
 #: build/trans_presets.java:1754 build/trans_presets.java:1755
-#: build/trans_presets.java:1770 build/trans_presets.java:1771
+#: build/trans_presets.java:1756 build/trans_presets.java:1771
 #: build/trans_presets.java:1772 build/trans_presets.java:1773
-#: build/trans_presets.java:1786 build/trans_presets.java:1787
+#: build/trans_presets.java:1774 build/trans_presets.java:1787
 #: build/trans_presets.java:1788 build/trans_presets.java:1789
-#: build/trans_presets.java:1803 build/trans_presets.java:1804
+#: build/trans_presets.java:1790 build/trans_presets.java:1804
 #: build/trans_presets.java:1805 build/trans_presets.java:1806
-#: build/trans_presets.java:1821 build/trans_presets.java:1822
+#: build/trans_presets.java:1807 build/trans_presets.java:1822
 #: build/trans_presets.java:1823 build/trans_presets.java:1824
-#: build/trans_presets.java:1838 build/trans_presets.java:1839
+#: build/trans_presets.java:1825 build/trans_presets.java:1839
 #: build/trans_presets.java:1840 build/trans_presets.java:1841
-#: build/trans_presets.java:1855 build/trans_presets.java:1856
+#: build/trans_presets.java:1842 build/trans_presets.java:1856
 #: build/trans_presets.java:1857 build/trans_presets.java:1858
-#: build/trans_presets.java:1861 build/trans_presets.java:1877
+#: build/trans_presets.java:1859 build/trans_presets.java:1862
 #: build/trans_presets.java:1878 build/trans_presets.java:1879
-#: build/trans_presets.java:1880 build/trans_presets.java:1900
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
 #: build/trans_presets.java:1901 build/trans_presets.java:1902
-#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1903 build/trans_presets.java:1904
 #: build/trans_presets.java:1920 build/trans_presets.java:1921
-#: build/trans_presets.java:1922 build/trans_presets.java:1936
+#: build/trans_presets.java:1922 build/trans_presets.java:1923
 #: build/trans_presets.java:1937 build/trans_presets.java:1938
-#: build/trans_presets.java:1939 build/trans_presets.java:1955
+#: build/trans_presets.java:1939 build/trans_presets.java:1940
 #: build/trans_presets.java:1956 build/trans_presets.java:1957
-#: build/trans_presets.java:1958 build/trans_presets.java:1974
+#: build/trans_presets.java:1958 build/trans_presets.java:1959
 #: build/trans_presets.java:1975 build/trans_presets.java:1976
-#: build/trans_presets.java:1977 build/trans_presets.java:1990
+#: build/trans_presets.java:1977 build/trans_presets.java:1978
 #: build/trans_presets.java:1991 build/trans_presets.java:1992
-#: build/trans_presets.java:1993 build/trans_presets.java:2007
+#: build/trans_presets.java:1993 build/trans_presets.java:1994
 #: build/trans_presets.java:2008 build/trans_presets.java:2009
-#: build/trans_presets.java:2010 build/trans_presets.java:2024
-#: build/trans_presets.java:2025 build/trans_presets.java:2095
-#: build/trans_presets.java:2158 build/trans_presets.java:2168
-#: build/trans_presets.java:2820 build/trans_presets.java:2898
-#: build/trans_presets.java:2899 build/trans_presets.java:2955
-#: build/trans_presets.java:2964 build/trans_presets.java:2965
-#: build/trans_presets.java:2966 build/trans_presets.java:3440
+#: build/trans_presets.java:2010 build/trans_presets.java:2011
+#: build/trans_presets.java:2025 build/trans_presets.java:2026
+#: build/trans_presets.java:2105 build/trans_presets.java:2115
+#: build/trans_presets.java:2186 build/trans_presets.java:2371
+#: build/trans_presets.java:2426 build/trans_presets.java:2427
+#: build/trans_presets.java:2484 build/trans_presets.java:2499
+#: build/trans_presets.java:2500 build/trans_presets.java:2501
+#: build/trans_presets.java:2922 build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "no"
 msgstr "nei"
@@ -23213,6 +23663,6 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:431 build/trans_style.java:553
-#: build/trans_style.java:561
+#: build/trans_presets.java:431 build/trans_style.java:554
+#: build/trans_style.java:562
 msgid "motorway"
 msgstr "motorway"
@@ -23238,6 +23688,6 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:431 build/trans_style.java:569
-#: build/trans_style.java:577
+#: build/trans_presets.java:431 build/trans_style.java:570
+#: build/trans_style.java:578
 msgid "trunk"
 msgstr "trunk"
@@ -23263,6 +23713,6 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:431 build/trans_style.java:585
-#: build/trans_style.java:593
+#: build/trans_presets.java:431 build/trans_style.java:586
+#: build/trans_style.java:594
 msgid "primary"
 msgstr "riksvei"
@@ -23288,6 +23738,6 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:431 build/trans_style.java:601
-#: build/trans_style.java:609
+#: build/trans_presets.java:431 build/trans_style.java:602
+#: build/trans_style.java:610
 msgid "secondary"
 msgstr "fylkesvei"
@@ -23301,5 +23751,5 @@
 #. <condition k="highway" v="tertiary"/>
 #. color tertiary
-#: build/trans_presets.java:431 build/trans_style.java:617
+#: build/trans_presets.java:431 build/trans_style.java:618
 msgid "tertiary"
 msgstr "kommunevei"
@@ -23317,5 +23767,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:431 build/trans_style.java:3562
+#: build/trans_presets.java:431 build/trans_style.java:3610
 msgid "residential"
 msgstr "boligvei"
@@ -23363,6 +23813,6 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:431 build/trans_style.java:673
-#: build/trans_style.java:4753
+#: build/trans_presets.java:431 build/trans_style.java:674
+#: build/trans_style.java:4801
 msgid "service"
 msgstr "adkomstvei"
@@ -23395,6 +23845,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:431 build/trans_style.java:922
-#: build/trans_style.java:3627 build/trans_style.java:3628
+#: build/trans_presets.java:431 build/trans_style.java:923
+#: build/trans_style.java:3683 build/trans_style.java:3684
 msgid "construction"
 msgstr "veiarbeid"
@@ -23481,5 +23931,5 @@
 msgstr ""
 
-#: build/trans_presets.java:508 build/trans_presets.java:3951
+#: build/trans_presets.java:508 build/trans_presets.java:4073
 msgid "hiking"
 msgstr "tur"
@@ -23513,5 +23963,5 @@
 msgstr ""
 
-#: build/trans_presets.java:511 build/trans_presets.java:2416
+#: build/trans_presets.java:511 build/trans_presets.java:2661
 msgid "intermediate"
 msgstr "middels"
@@ -23526,12 +23976,12 @@
 
 #. item "Ways/Path" combo "Wheelchairs"
-#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
-#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
-#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
-#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
-#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Facilities/Accommodation/Hotel" combo "Wheelchairs"
+#. item "Facilities/Accommodation/Motel" combo "Wheelchairs"
+#. item "Facilities/Accommodation/Guest House" combo "Wheelchairs"
+#. item "Facilities/Accommodation/Chalet" combo "Wheelchairs"
+#. item "Facilities/Accommodation/Hostel" combo "Wheelchairs"
+#. item "Facilities/Accommodation/Alpine Hut" combo "Wheelchairs"
+#. item "Facilities/Accommodation/Caravan Site" combo "Wheelchairs"
+#. item "Facilities/Accommodation/Camping Site" combo "Wheelchairs"
 #. item "Food+Drinks/Restaurant" combo "Wheelchairs"
 #. item "Food+Drinks/Fast Food" combo "Wheelchairs"
@@ -23542,13 +23992,13 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:521 build/trans_presets.java:1755
-#: build/trans_presets.java:1773 build/trans_presets.java:1789
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1841 build/trans_presets.java:1858
-#: build/trans_presets.java:1880 build/trans_presets.java:1903
-#: build/trans_presets.java:1922 build/trans_presets.java:1939
-#: build/trans_presets.java:1958 build/trans_presets.java:1977
-#: build/trans_presets.java:1993 build/trans_presets.java:2010
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:521 build/trans_presets.java:1756
+#: build/trans_presets.java:1774 build/trans_presets.java:1790
+#: build/trans_presets.java:1807 build/trans_presets.java:1825
+#: build/trans_presets.java:1842 build/trans_presets.java:1859
+#: build/trans_presets.java:1881 build/trans_presets.java:1904
+#: build/trans_presets.java:1923 build/trans_presets.java:1940
+#: build/trans_presets.java:1959 build/trans_presets.java:1978
+#: build/trans_presets.java:1994 build/trans_presets.java:2011
+#: build/trans_presets.java:2026
 msgid "Wheelchairs"
 msgstr ""
@@ -23689,8 +24139,8 @@
 #. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Public Transport/Ticket Machine" text "Operator"
-#. item "Travel/Accomodation/Hotel" text "Operator"
-#. item "Travel/Accomodation/Motel" text "Operator"
-#. item "Travel/Accomodation/Hostel" text "Operator"
-#. item "Travel/Accomodation/Alpine Hut" text "Operator"
+#. item "Facilities/Accommodation/Hotel" text "Operator"
+#. item "Facilities/Accommodation/Motel" text "Operator"
+#. item "Facilities/Accommodation/Hostel" text "Operator"
+#. item "Facilities/Accommodation/Alpine Hut" text "Operator"
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
@@ -23700,52 +24150,62 @@
 #. item "Tourism/Audioguide" text "Operator"
 #. item "Leisure/Sauna" text "Operator"
-#. item "Man-Made/Buildings/Post Office" text "Operator"
-#. item "Man-Made/Buildings/Studio" text "Operator"
-#. item "Man-Made/Buildings/Driving School" text "Operator"
-#. item "Man Made/Tower" text "Operator"
-#. item "Man Made/Chimney" text "Operator"
-#. <key key="man_made" value="pipeline" />
-#. item "Man Made/Pipeline" text "Operator"
-#. item "Man Made/Mineshaft" text "Operator"
-#. item "Man Made/Power Station" text "Operator"
-#. <key key="power" value="sub_station" />
-#. item "Man Made/Power Sub Station" text "Operator"
-#. item "Man Made/Power Line" text "Operator"
+#. item "Culture/Recording Studio" text "Operator"
+#. item "Public Building/Community Centre" text "Operator"
+#. item "Public Building/Post Office" text "Operator"
+#. item "Education/Driving School" text "Operator"
+#. item "Health/Hearing Aids" text "Operator"
+#. <key key="amenity" value="baby_hatch" />
+#. item "Health/Baby Hatch" text "Operator"
+#. item "Health/Emergency Access Point" text "Operator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
 #. <key key="amenity" value="toilets" />
-#. item "Amenities/Toilets" text "Operator"
+#. item "Facilities/Toilets" text "Operator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
 #. <key key="amenity" value="post_box" />
-#. item "Amenities/Post Box" text "Operator"
+#. item "Facilities/Post Box" text "Operator"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Telephone" text "Operator"
-#. item "Food/Seafood" text "Operator"
-#. item "Food/Deli (Fine Food)" text "Operator"
-#. item "Food/Marketplace" text "Operator"
-#. item "Food/Greengrocer" text "Operator"
-#. item "Shops/Hearing Aids" text "Operator"
-#. item "Shops/Jewelry" text "Operator"
-#. item "Shops/Erotic" text "Operator"
-#. item "Shops/Department Store" text "Operator"
-#. item "Shops/Mall" text "Operator"
-#. item "Shops/Boutique" text "Operator"
-#. item "Shops/Fabric" text "Operator"
-#. item "Shops/Mobile Phone" text "Operator"
-#. item "Shops/Vacuum Cleaner" text "Operator"
-#. item "Shops/Paint" text "Operator"
-#. item "Shops/Kitchen" text "Operator"
-#. item "Shops/Curtain" text "Operator"
-#. item "Shops/Frame" text "Operator"
-#. item "Shops/Copyshop" text "Operator"
-#. item "Shops/Musical Instrument" text "Operator"
-#. item "Shops/Variety Store" text "Operator"
-#. item "Shops/Vending machine" text "Operator"
+#. item "Facilities/Telephone" text "Operator"
+#. item "Sport (Ball)/Volleyball" text "Operator"
+#. item "Sport (Ball)/Beachvolleyball" text "Operator"
+#. item "Man Made/Man Made/Tower" text "Operator"
+#. item "Man Made/Man Made/Chimney" text "Operator"
+#. <key key="man_made" value="pipeline" />
+#. item "Man Made/Man Made/Pipeline" text "Operator"
+#. item "Man Made/Man Made/Mineshaft" text "Operator"
+#. item "Man Made/Man Made/Adit" text "Operator"
+#. item "Man Made/Man Made/Water Works" text "Operator"
+#. item "Man Made/Man Made/Measurement Station" text "Operator"
+#. item "Power/Power Station" text "Operator"
+#. <key key="power" value="sub_station" />
+#. item "Power/Power Sub Station" text "Operator"
+#. <key key="power" value="cable_distribution_cabinet" />
+#. item "Power/Cable Distribution Cabinet" text "Operator"
+#. item "Power/Power Line" text "Operator"
+#. item "Shops/Food/Seafood" text "Operator"
+#. item "Shops/Food/Deli (Fine Food)" text "Operator"
+#. item "Shops/Food/Marketplace" text "Operator"
+#. item "Shops/Food/Greengrocer" text "Operator"
+#. item "Clothes/Boutique" text "Operator"
+#. item "Clothes/Fabric" text "Operator"
+#. item "Electronic/Mobile Phone" text "Operator"
+#. item "Electronic/Vacuum Cleaner" text "Operator"
 #. item "Cash/Bank" text "Operator"
 #. <key key="amenity" value="atm" />
 #. item "Cash/Automated Teller Machine" text "Operator"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Health/Baby Hatch" text "Operator"
-#. item "Health/Emergency Access Point" text "Operator"
+#. item "Other/Department Store" text "Operator"
+#. item "Other/Mall" text "Operator"
+#. item "Other/Jewelry" text "Operator"
+#. item "Other/Erotic" text "Operator"
+#. item "Other/Paint" text "Operator"
+#. item "Other/Kitchen" text "Operator"
+#. item "Other/Curtain" text "Operator"
+#. item "Other/Frame" text "Operator"
+#. item "Other/Copyshop" text "Operator"
+#. item "Other/Musical Instrument" text "Operator"
+#. item "Other/Variety Store" text "Operator"
+#. item "Vending machine" text "Operator"
+#. item "Land use/Greenhouse Horticulture" text "Operator"
+#. item "Land use/Garages" text "Operator"
 #. item "Relations/Route" text "Operator"
 #. item "Relations/Route network" text "Operator"
@@ -23755,31 +24215,35 @@
 #: build/trans_presets.java:1469 build/trans_presets.java:1477
 #: build/trans_presets.java:1493 build/trans_presets.java:1502
-#: build/trans_presets.java:1521 build/trans_presets.java:1652
-#: build/trans_presets.java:1749 build/trans_presets.java:1767
-#: build/trans_presets.java:1818 build/trans_presets.java:1835
-#: build/trans_presets.java:1894 build/trans_presets.java:1915
-#: build/trans_presets.java:1951 build/trans_presets.java:1970
-#: build/trans_presets.java:2156 build/trans_presets.java:2166
-#: build/trans_presets.java:2268 build/trans_presets.java:2646
-#: build/trans_presets.java:2654 build/trans_presets.java:2689
-#: build/trans_presets.java:2746 build/trans_presets.java:2755
-#: build/trans_presets.java:2792 build/trans_presets.java:2818
-#: build/trans_presets.java:2858 build/trans_presets.java:2866
-#: build/trans_presets.java:2883 build/trans_presets.java:2896
-#: build/trans_presets.java:2905 build/trans_presets.java:2912
-#: build/trans_presets.java:3037 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3064
-#: build/trans_presets.java:3112 build/trans_presets.java:3121
-#: build/trans_presets.java:3130 build/trans_presets.java:3140
-#: build/trans_presets.java:3149 build/trans_presets.java:3165
-#: build/trans_presets.java:3213 build/trans_presets.java:3235
-#: build/trans_presets.java:3244 build/trans_presets.java:3287
-#: build/trans_presets.java:3309 build/trans_presets.java:3318
-#: build/trans_presets.java:3327 build/trans_presets.java:3342
-#: build/trans_presets.java:3363 build/trans_presets.java:3378
-#: build/trans_presets.java:3387 build/trans_presets.java:3404
-#: build/trans_presets.java:3419 build/trans_presets.java:3454
-#: build/trans_presets.java:3465 build/trans_presets.java:3958
-#: build/trans_presets.java:3978
+#: build/trans_presets.java:1521 build/trans_presets.java:1653
+#: build/trans_presets.java:1750 build/trans_presets.java:1768
+#: build/trans_presets.java:1819 build/trans_presets.java:1836
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1952 build/trans_presets.java:1971
+#: build/trans_presets.java:2103 build/trans_presets.java:2113
+#: build/trans_presets.java:2163 build/trans_presets.java:2248
+#: build/trans_presets.java:2273 build/trans_presets.java:2316
+#: build/trans_presets.java:2349 build/trans_presets.java:2381
+#: build/trans_presets.java:2394 build/trans_presets.java:2405
+#: build/trans_presets.java:2424 build/trans_presets.java:2433
+#: build/trans_presets.java:2440 build/trans_presets.java:2733
+#: build/trans_presets.java:2742 build/trans_presets.java:2864
+#: build/trans_presets.java:2883 build/trans_presets.java:2902
+#: build/trans_presets.java:2920 build/trans_presets.java:2931
+#: build/trans_presets.java:2947 build/trans_presets.java:3003
+#: build/trans_presets.java:3038 build/trans_presets.java:3046
+#: build/trans_presets.java:3054 build/trans_presets.java:3079
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3220 build/trans_presets.java:3229
+#: build/trans_presets.java:3266 build/trans_presets.java:3315
+#: build/trans_presets.java:3338 build/trans_presets.java:3347
+#: build/trans_presets.java:3369 build/trans_presets.java:3384
+#: build/trans_presets.java:3394 build/trans_presets.java:3403
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3479 build/trans_presets.java:3495
+#: build/trans_presets.java:3504 build/trans_presets.java:3513
+#: build/trans_presets.java:3529 build/trans_presets.java:3551
+#: build/trans_presets.java:3566 build/trans_presets.java:3575
+#: build/trans_presets.java:3843 build/trans_presets.java:3936
+#: build/trans_presets.java:4080 build/trans_presets.java:4100
 msgid "Operator"
 msgstr "Operatør"
@@ -24058,12 +24522,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Elevation"
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. item "Facilities/Accommodation/Alpine Hut" text "Elevation"
 #. item "Tourism/Guidepost" text "Elevation"
 #. item "Geography/Peak" text "Elevation"
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:781 build/trans_presets.java:1836
-#: build/trans_presets.java:2136 build/trans_presets.java:3603
-#: build/trans_presets.java:3611 build/trans_presets.java:3619
+#: build/trans_presets.java:781 build/trans_presets.java:1837
+#: build/trans_presets.java:2086 build/trans_presets.java:3709
+#: build/trans_presets.java:3717 build/trans_presets.java:3725
 msgid "Elevation"
 msgstr "Høyde"
@@ -24075,6 +24539,6 @@
 #. item "Water/Water/Dam" text "Wikipedia"
 #. item "Airport/Airport Ground" text "Wikipedia"
-#. item "Tourism/Museum" text "Wikipedia"
-#. item "Tourism/Zoo" text "Wikipedia"
+#. item "Leisure/Zoo" text "Wikipedia"
+#. item "Culture/Museum" text "Wikipedia"
 #. item "Historic Places/Castle" text "Wikipedia"
 #. item "Places/Continent" text "Wikipedia"
@@ -24099,16 +24563,16 @@
 #: build/trans_presets.java:782 build/trans_presets.java:1020
 #: build/trans_presets.java:1031 build/trans_presets.java:1045
-#: build/trans_presets.java:1060 build/trans_presets.java:1678
-#: build/trans_presets.java:2046 build/trans_presets.java:2055
-#: build/trans_presets.java:2187 build/trans_presets.java:3519
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3540 build/trans_presets.java:3547
-#: build/trans_presets.java:3555 build/trans_presets.java:3563
-#: build/trans_presets.java:3571 build/trans_presets.java:3578
-#: build/trans_presets.java:3585 build/trans_presets.java:3594
-#: build/trans_presets.java:3604 build/trans_presets.java:3612
-#: build/trans_presets.java:3620 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3644
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:1060 build/trans_presets.java:1679
+#: build/trans_presets.java:2142 build/trans_presets.java:2202
+#: build/trans_presets.java:3094 build/trans_presets.java:3625
+#: build/trans_presets.java:3632 build/trans_presets.java:3639
+#: build/trans_presets.java:3646 build/trans_presets.java:3653
+#: build/trans_presets.java:3661 build/trans_presets.java:3669
+#: build/trans_presets.java:3677 build/trans_presets.java:3684
+#: build/trans_presets.java:3691 build/trans_presets.java:3700
+#: build/trans_presets.java:3710 build/trans_presets.java:3718
+#: build/trans_presets.java:3726 build/trans_presets.java:3733
+#: build/trans_presets.java:3742 build/trans_presets.java:3750
+#: build/trans_presets.java:4015
 msgid "Wikipedia"
 msgstr ""
@@ -24613,5 +25077,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1121 build/trans_style.java:3794
+#: build/trans_presets.java:1121 build/trans_style.java:3850
 msgid "marsh"
 msgstr "myrområde"
@@ -24805,11 +25269,11 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1152 build/trans_presets.java:3951
-#: build/trans_style.java:233 build/trans_style.java:689
-#: build/trans_style.java:715 build/trans_style.java:723
-#: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:995 build/trans_style.java:1003
-#: build/trans_style.java:1011 build/trans_style.java:1019
-#: build/trans_style.java:1027
+#: build/trans_presets.java:1152 build/trans_presets.java:4073
+#: build/trans_style.java:234 build/trans_style.java:690
+#: build/trans_style.java:716 build/trans_style.java:724
+#: build/trans_style.java:749 build/trans_style.java:758
+#: build/trans_style.java:996 build/trans_style.java:1004
+#: build/trans_style.java:1012 build/trans_style.java:1020
+#: build/trans_style.java:1028
 msgid "bicycle"
 msgstr "sykkel"
@@ -25084,9 +25548,9 @@
 #: build/trans_presets.java:1242 build/trans_presets.java:1254
 #: build/trans_presets.java:1266 build/trans_presets.java:1278
-#: build/trans_presets.java:1290 build/trans_style.java:781
-#: build/trans_style.java:1268 build/trans_style.java:1332
-#: build/trans_style.java:1340 build/trans_style.java:1349
-#: build/trans_style.java:1357 build/trans_style.java:1365
-#: build/trans_style.java:1366 build/trans_style.java:1373
+#: build/trans_presets.java:1290 build/trans_style.java:782
+#: build/trans_style.java:1269 build/trans_style.java:1333
+#: build/trans_style.java:1341 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1367 build/trans_style.java:1374
 msgid "rail"
 msgstr "jernbane"
@@ -25101,10 +25565,10 @@
 #. item "Car/Charging Station" text "Voltage"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#. item "Man Made/Power Line" combo "Voltage"
+#. item "Power/Power Line" combo "Voltage"
 #: build/trans_presets.java:1219 build/trans_presets.java:1231
 #: build/trans_presets.java:1243 build/trans_presets.java:1255
 #: build/trans_presets.java:1267 build/trans_presets.java:1279
 #: build/trans_presets.java:1291 build/trans_presets.java:1445
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:3082
 msgid "Voltage"
 msgstr "Spenning"
@@ -25371,5 +25835,5 @@
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #: build/trans_presets.java:1393 build/trans_presets.java:1507
-#: build/trans_presets.java:1538 build/trans_surveyor.java:24
+#: build/trans_presets.java:1539 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkering"
@@ -25385,9 +25849,9 @@
 #. item "Tourism/Information Terminal" text "Reference number"
 #. item "Tourism/Audioguide" text "Reference number"
-#. item "Amenities/Toilets" text "Reference number"
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:1399 build/trans_presets.java:2157
-#: build/trans_presets.java:2167 build/trans_presets.java:2897
-#: build/trans_presets.java:3388
+#. item "Facilities/Toilets" text "Reference number"
+#. item "Vending machine" text "Reference number"
+#: build/trans_presets.java:1399 build/trans_presets.java:2104
+#: build/trans_presets.java:2114 build/trans_presets.java:2425
+#: build/trans_presets.java:3576
 msgid "Reference number"
 msgstr "Referansenummer"
@@ -25402,5 +25866,4 @@
 
 #: build/trans_presets.java:1400 build/trans_presets.java:1512
-#: build/trans_presets.java:2794
 msgid "underground"
 msgstr "P-kjeller"
@@ -25415,8 +25878,8 @@
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
-#. item "Amenities/Toilets" combo "Fee"
+#. item "Facilities/Toilets" combo "Fee"
 #: build/trans_presets.java:1402 build/trans_presets.java:1513
-#: build/trans_presets.java:2158 build/trans_presets.java:2168
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2105 build/trans_presets.java:2115
+#: build/trans_presets.java:2426
 msgid "Fee"
 msgstr "Gebyr"
@@ -25529,5 +25992,5 @@
 msgstr ""
 
-#: build/trans_presets.java:1417 build/trans_presets.java:1520
+#: build/trans_presets.java:1417
 msgid "Independent"
 msgstr ""
@@ -25549,117 +26012,119 @@
 #. item "Food+Drinks/Nightclub" combo "Opening Hours"
 #. item "Tourism/Attraction" text "Opening Hours"
-#. item "Tourism/Museum" combo "Opening Hours"
-#. item "Tourism/Zoo" combo "Opening Hours"
-#. item "Tourism/Theme Park" combo "Opening Hours"
 #. item "Tourism/Information Office" combo "Opening Hours"
-#. item "Historic Places/Ruins" combo "Opening Hours"
-#. item "Historic Places/Archaeological Site" combo "Opening Hours"
+#. item "Leisure/Zoo" combo "Opening Hours"
+#. item "Leisure/Theme Park" combo "Opening Hours"
 #. item "Leisure/Sauna" combo "Opening Hours"
-#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours"
-#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours"
-#. item "Man-Made/Buildings/Library" combo "Opening Hours"
-#. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Food/Supermarket" combo "Opening Hours"
-#. item "Food/Convenience Store" combo "Opening Hours"
-#. item "Food/Kiosk" combo "Opening Hours"
-#. item "Food/Confectionery" combo "Opening Hours"
-#. item "Food/Baker" combo "Opening Hours"
-#. item "Food/Butcher" combo "Opening Hours"
-#. item "Food/Seafood" combo "Opening Hours"
-#. item "Food/Deli (Fine Food)" combo "Opening Hours"
-#. item "Food/Marketplace" combo "Opening Hours"
-#. item "Food/Greengrocer" combo "Opening Hours"
-#. item "Food/Organic" combo "Opening Hours"
-#. item "Food/Alcohol" combo "Opening Hours"
-#. item "Food/Beverages" combo "Opening Hours"
-#. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
-#. item "Shops/Hearing Aids" combo "Opening Hours"
-#. item "Shops/Jewelry" combo "Opening Hours"
-#. item "Shops/Erotic" combo "Opening Hours"
-#. item "Shops/Department Store" combo "Opening Hours"
-#. item "Shops/Mall" combo "Opening Hours"
-#. item "Shops/Clothes" combo "Opening Hours"
-#. item "Shops/Boutique" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Tailor" combo "Opening Hours"
-#. item "Shops/Fabric" combo "Opening Hours"
-#. item "Shops/Computer" combo "Opening Hours"
-#. item "Shops/Electronics" combo "Opening Hours"
-#. item "Shops/Mobile Phone" combo "Opening Hours"
-#. item "Shops/Vacuum Cleaner" combo "Opening Hours"
-#. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Garden Centre" combo "Opening Hours"
-#. item "Shops/Hardware" combo "Opening Hours"
-#. item "Shops/Paint" combo "Opening Hours"
-#. item "Shops/Do-it-yourself-store" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
-#. item "Shops/Kitchen" combo "Opening Hours"
-#. item "Shops/Curtain" combo "Opening Hours"
-#. item "Shops/Frame" combo "Opening Hours"
-#. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Copyshop" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Musical Instrument" combo "Opening Hours"
-#. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Variety Store" combo "Opening Hours"
-#. item "Cash/Bank" combo "Opening Hours"
-#. item "Cash/Money Exchange" combo "Opening Hours"
+#. item "Culture/Museum" combo "Opening Hours"
+#. item "Culture/Library" combo "Opening Hours"
+#. item "Culture/Place of Worship" combo "Opening Hours"
+#. item "Public Building/Community Centre" combo "Opening Hours"
 #. item "Health/Doctors" combo "Opening Hours"
 #. item "Health/Dentist" combo "Opening Hours"
 #. item "Health/Pharmacy" combo "Opening Hours"
+#. item "Health/Hearing Aids" combo "Opening Hours"
 #. item "Health/Baby Hatch" text "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours"
+#. item "Historic Places/Ruins" combo "Opening Hours"
+#. item "Historic Places/Archaeological Site" combo "Opening Hours"
+#. item "Shops/Food/Supermarket" combo "Opening Hours"
+#. item "Shops/Food/Convenience Store" combo "Opening Hours"
+#. item "Shops/Food/Kiosk" combo "Opening Hours"
+#. item "Shops/Food/Baker" combo "Opening Hours"
+#. item "Shops/Food/Butcher" combo "Opening Hours"
+#. item "Shops/Food/Seafood" combo "Opening Hours"
+#. item "Shops/Food/Deli (Fine Food)" combo "Opening Hours"
+#. item "Shops/Food/Confectionery" combo "Opening Hours"
+#. item "Shops/Food/Marketplace" combo "Opening Hours"
+#. item "Shops/Food/Greengrocer" combo "Opening Hours"
+#. item "Shops/Food/Organic" combo "Opening Hours"
+#. item "Shops/Food/Alcohol" combo "Opening Hours"
+#. item "Shops/Food/Beverages" combo "Opening Hours"
+#. item "Clothes/Clothes" combo "Opening Hours"
+#. item "Clothes/Boutique" combo "Opening Hours"
+#. item "Clothes/Shoes" combo "Opening Hours"
+#. item "Clothes/Outdoor" combo "Opening Hours"
+#. item "Clothes/Sports" combo "Opening Hours"
+#. item "Clothes/Dry Cleaning" combo "Opening Hours"
+#. item "Clothes/Laundry" combo "Opening Hours"
+#. item "Clothes/Tailor" combo "Opening Hours"
+#. item "Clothes/Fabric" combo "Opening Hours"
+#. item "Electronic/Computer" combo "Opening Hours"
+#. item "Electronic/Electronics" combo "Opening Hours"
+#. item "Electronic/Mobile Phone" combo "Opening Hours"
+#. item "Electronic/Vacuum Cleaner" combo "Opening Hours"
+#. item "Electronic/Hifi" combo "Opening Hours"
+#. item "Electronic/Video" combo "Opening Hours"
+#. item "Cash/Bank" combo "Opening Hours"
+#. item "Cash/Money Exchange" combo "Opening Hours"
+#. item "Other/Department Store" combo "Opening Hours"
+#. item "Other/Mall" combo "Opening Hours"
+#. item "Other/Chemist" combo "Opening Hours"
+#. item "Other/Hairdresser" combo "Opening Hours"
+#. item "Other/Optician" combo "Opening Hours"
+#. item "Other/Jewelry" combo "Opening Hours"
+#. item "Other/Erotic" combo "Opening Hours"
+#. item "Other/Florist" combo "Opening Hours"
+#. item "Other/Garden Centre" combo "Opening Hours"
+#. item "Other/Do-it-yourself-store" combo "Opening Hours"
+#. item "Other/Hardware" combo "Opening Hours"
+#. item "Other/Paint" combo "Opening Hours"
+#. item "Other/Furniture" combo "Opening Hours"
+#. item "Other/Kitchen" combo "Opening Hours"
+#. item "Other/Curtain" combo "Opening Hours"
+#. item "Other/Frame" combo "Opening Hours"
+#. item "Other/Stationery" combo "Opening Hours"
+#. item "Other/Copyshop" combo "Opening Hours"
+#. item "Other/Book Store" combo "Opening Hours"
+#. item "Other/Travel Agency" combo "Opening Hours"
+#. item "Other/Musical Instrument" combo "Opening Hours"
+#. item "Other/Toys" combo "Opening Hours"
+#. item "Other/Variety Store" combo "Opening Hours"
 #: build/trans_presets.java:1421 build/trans_presets.java:1454
 #: build/trans_presets.java:1470 build/trans_presets.java:1478
 #: build/trans_presets.java:1494 build/trans_presets.java:1503
-#: build/trans_presets.java:1522 build/trans_presets.java:1897
-#: build/trans_presets.java:1917 build/trans_presets.java:1934
-#: build/trans_presets.java:1953 build/trans_presets.java:1972
-#: build/trans_presets.java:1988 build/trans_presets.java:2005
-#: build/trans_presets.java:2022 build/trans_presets.java:2038
-#: build/trans_presets.java:2045 build/trans_presets.java:2054
-#: build/trans_presets.java:2061 build/trans_presets.java:2104
-#: build/trans_presets.java:2193 build/trans_presets.java:2201
-#: build/trans_presets.java:2269 build/trans_presets.java:2316
-#: build/trans_presets.java:2322 build/trans_presets.java:2706
-#: build/trans_presets.java:2730 build/trans_presets.java:2994
-#: build/trans_presets.java:3001 build/trans_presets.java:3008
-#: build/trans_presets.java:3015 build/trans_presets.java:3022
-#: build/trans_presets.java:3029 build/trans_presets.java:3038
-#: build/trans_presets.java:3047 build/trans_presets.java:3056
-#: build/trans_presets.java:3065 build/trans_presets.java:3071
-#: build/trans_presets.java:3078 build/trans_presets.java:3084
-#: build/trans_presets.java:3092 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3113
-#: build/trans_presets.java:3122 build/trans_presets.java:3131
-#: build/trans_presets.java:3141 build/trans_presets.java:3150
-#: build/trans_presets.java:3157 build/trans_presets.java:3166
-#: build/trans_presets.java:3172 build/trans_presets.java:3179
-#: build/trans_presets.java:3185 build/trans_presets.java:3192
-#: build/trans_presets.java:3199 build/trans_presets.java:3205
-#: build/trans_presets.java:3214 build/trans_presets.java:3221
-#: build/trans_presets.java:3227 build/trans_presets.java:3236
-#: build/trans_presets.java:3245 build/trans_presets.java:3251
-#: build/trans_presets.java:3257 build/trans_presets.java:3265
-#: build/trans_presets.java:3272 build/trans_presets.java:3279
-#: build/trans_presets.java:3288 build/trans_presets.java:3295
-#: build/trans_presets.java:3301 build/trans_presets.java:3310
-#: build/trans_presets.java:3319 build/trans_presets.java:3328
-#: build/trans_presets.java:3334 build/trans_presets.java:3343
-#: build/trans_presets.java:3349 build/trans_presets.java:3355
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3379 build/trans_presets.java:3405
-#: build/trans_presets.java:3413 build/trans_presets.java:3428
-#: build/trans_presets.java:3434 build/trans_presets.java:3442
-#: build/trans_presets.java:3455 build/trans_presets.java:3476
+#: build/trans_presets.java:1522 build/trans_presets.java:1898
+#: build/trans_presets.java:1918 build/trans_presets.java:1935
+#: build/trans_presets.java:1954 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2023 build/trans_presets.java:2039
+#: build/trans_presets.java:2054 build/trans_presets.java:2141
+#: build/trans_presets.java:2148 build/trans_presets.java:2164
+#: build/trans_presets.java:2201 build/trans_presets.java:2217
+#: build/trans_presets.java:2240 build/trans_presets.java:2274
+#: build/trans_presets.java:2359 build/trans_presets.java:2365
+#: build/trans_presets.java:2373 build/trans_presets.java:2382
+#: build/trans_presets.java:2395 build/trans_presets.java:2416
+#: build/trans_presets.java:2561 build/trans_presets.java:2567
+#: build/trans_presets.java:3100 build/trans_presets.java:3108
+#: build/trans_presets.java:3157 build/trans_presets.java:3164
+#: build/trans_presets.java:3171 build/trans_presets.java:3179
+#: build/trans_presets.java:3186 build/trans_presets.java:3195
+#: build/trans_presets.java:3204 build/trans_presets.java:3211
+#: build/trans_presets.java:3221 build/trans_presets.java:3230
+#: build/trans_presets.java:3236 build/trans_presets.java:3244
+#: build/trans_presets.java:3250 build/trans_presets.java:3258
+#: build/trans_presets.java:3267 build/trans_presets.java:3273
+#: build/trans_presets.java:3280 build/trans_presets.java:3286
+#: build/trans_presets.java:3294 build/trans_presets.java:3301
+#: build/trans_presets.java:3307 build/trans_presets.java:3316
+#: build/trans_presets.java:3324 build/trans_presets.java:3330
+#: build/trans_presets.java:3339 build/trans_presets.java:3348
+#: build/trans_presets.java:3354 build/trans_presets.java:3360
+#: build/trans_presets.java:3370 build/trans_presets.java:3378
+#: build/trans_presets.java:3395 build/trans_presets.java:3404
+#: build/trans_presets.java:3411 build/trans_presets.java:3417
+#: build/trans_presets.java:3423 build/trans_presets.java:3432
+#: build/trans_presets.java:3441 build/trans_presets.java:3449
+#: build/trans_presets.java:3456 build/trans_presets.java:3464
+#: build/trans_presets.java:3471 build/trans_presets.java:3480
+#: build/trans_presets.java:3487 build/trans_presets.java:3496
+#: build/trans_presets.java:3505 build/trans_presets.java:3514
+#: build/trans_presets.java:3521 build/trans_presets.java:3530
+#: build/trans_presets.java:3536 build/trans_presets.java:3543
+#: build/trans_presets.java:3552 build/trans_presets.java:3558
+#: build/trans_presets.java:3567
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -25668,43 +26133,43 @@
 #: build/trans_presets.java:1470 build/trans_presets.java:1478
 #: build/trans_presets.java:1494 build/trans_presets.java:1503
-#: build/trans_presets.java:1522 build/trans_presets.java:1897
-#: build/trans_presets.java:1917 build/trans_presets.java:1934
-#: build/trans_presets.java:1953 build/trans_presets.java:1972
-#: build/trans_presets.java:1988 build/trans_presets.java:2005
-#: build/trans_presets.java:2022 build/trans_presets.java:2045
-#: build/trans_presets.java:2054 build/trans_presets.java:2061
-#: build/trans_presets.java:2104 build/trans_presets.java:2193
-#: build/trans_presets.java:2201 build/trans_presets.java:2316
-#: build/trans_presets.java:2322 build/trans_presets.java:2706
-#: build/trans_presets.java:2730 build/trans_presets.java:2994
-#: build/trans_presets.java:3001 build/trans_presets.java:3008
-#: build/trans_presets.java:3015 build/trans_presets.java:3022
-#: build/trans_presets.java:3029 build/trans_presets.java:3038
-#: build/trans_presets.java:3047 build/trans_presets.java:3056
-#: build/trans_presets.java:3065 build/trans_presets.java:3071
-#: build/trans_presets.java:3078 build/trans_presets.java:3084
-#: build/trans_presets.java:3092 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3113
-#: build/trans_presets.java:3122 build/trans_presets.java:3131
-#: build/trans_presets.java:3141 build/trans_presets.java:3150
-#: build/trans_presets.java:3157 build/trans_presets.java:3166
-#: build/trans_presets.java:3172 build/trans_presets.java:3179
-#: build/trans_presets.java:3185 build/trans_presets.java:3192
-#: build/trans_presets.java:3199 build/trans_presets.java:3205
-#: build/trans_presets.java:3214 build/trans_presets.java:3221
-#: build/trans_presets.java:3227 build/trans_presets.java:3236
-#: build/trans_presets.java:3245 build/trans_presets.java:3251
-#: build/trans_presets.java:3257 build/trans_presets.java:3265
-#: build/trans_presets.java:3272 build/trans_presets.java:3279
-#: build/trans_presets.java:3288 build/trans_presets.java:3295
-#: build/trans_presets.java:3301 build/trans_presets.java:3310
-#: build/trans_presets.java:3319 build/trans_presets.java:3328
-#: build/trans_presets.java:3334 build/trans_presets.java:3343
-#: build/trans_presets.java:3349 build/trans_presets.java:3355
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3379 build/trans_presets.java:3405
-#: build/trans_presets.java:3413 build/trans_presets.java:3428
-#: build/trans_presets.java:3434 build/trans_presets.java:3442
-#: build/trans_presets.java:3476
+#: build/trans_presets.java:1522 build/trans_presets.java:1898
+#: build/trans_presets.java:1918 build/trans_presets.java:1935
+#: build/trans_presets.java:1954 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2023 build/trans_presets.java:2054
+#: build/trans_presets.java:2141 build/trans_presets.java:2148
+#: build/trans_presets.java:2201 build/trans_presets.java:2217
+#: build/trans_presets.java:2240 build/trans_presets.java:2274
+#: build/trans_presets.java:2359 build/trans_presets.java:2365
+#: build/trans_presets.java:2373 build/trans_presets.java:2382
+#: build/trans_presets.java:2416 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:3100
+#: build/trans_presets.java:3108 build/trans_presets.java:3157
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3179 build/trans_presets.java:3186
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
+#: build/trans_presets.java:3211 build/trans_presets.java:3221
+#: build/trans_presets.java:3230 build/trans_presets.java:3236
+#: build/trans_presets.java:3244 build/trans_presets.java:3250
+#: build/trans_presets.java:3258 build/trans_presets.java:3267
+#: build/trans_presets.java:3273 build/trans_presets.java:3280
+#: build/trans_presets.java:3286 build/trans_presets.java:3294
+#: build/trans_presets.java:3301 build/trans_presets.java:3307
+#: build/trans_presets.java:3316 build/trans_presets.java:3324
+#: build/trans_presets.java:3330 build/trans_presets.java:3339
+#: build/trans_presets.java:3348 build/trans_presets.java:3354
+#: build/trans_presets.java:3360 build/trans_presets.java:3370
+#: build/trans_presets.java:3378 build/trans_presets.java:3395
+#: build/trans_presets.java:3404 build/trans_presets.java:3411
+#: build/trans_presets.java:3417 build/trans_presets.java:3423
+#: build/trans_presets.java:3432 build/trans_presets.java:3441
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3464 build/trans_presets.java:3471
+#: build/trans_presets.java:3480 build/trans_presets.java:3487
+#: build/trans_presets.java:3496 build/trans_presets.java:3505
+#: build/trans_presets.java:3514 build/trans_presets.java:3521
+#: build/trans_presets.java:3530 build/trans_presets.java:3536
+#: build/trans_presets.java:3543 build/trans_presets.java:3552
+#: build/trans_presets.java:3558 build/trans_presets.java:3567
 msgid "24/7"
 msgstr ""
@@ -25713,43 +26178,44 @@
 #: build/trans_presets.java:1470 build/trans_presets.java:1478
 #: build/trans_presets.java:1494 build/trans_presets.java:1503
-#: build/trans_presets.java:1522 build/trans_presets.java:1897
-#: build/trans_presets.java:1917 build/trans_presets.java:1934
-#: build/trans_presets.java:1953 build/trans_presets.java:1972
-#: build/trans_presets.java:1988 build/trans_presets.java:2005
-#: build/trans_presets.java:2022 build/trans_presets.java:2045
-#: build/trans_presets.java:2054 build/trans_presets.java:2061
-#: build/trans_presets.java:2104 build/trans_presets.java:2193
-#: build/trans_presets.java:2201 build/trans_presets.java:2269
-#: build/trans_presets.java:2316 build/trans_presets.java:2322
-#: build/trans_presets.java:2706 build/trans_presets.java:2730
-#: build/trans_presets.java:2994 build/trans_presets.java:3001
-#: build/trans_presets.java:3008 build/trans_presets.java:3015
-#: build/trans_presets.java:3022 build/trans_presets.java:3029
-#: build/trans_presets.java:3038 build/trans_presets.java:3047
-#: build/trans_presets.java:3056 build/trans_presets.java:3065
-#: build/trans_presets.java:3071 build/trans_presets.java:3078
-#: build/trans_presets.java:3084 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3113 build/trans_presets.java:3122
-#: build/trans_presets.java:3131 build/trans_presets.java:3141
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3166 build/trans_presets.java:3172
-#: build/trans_presets.java:3179 build/trans_presets.java:3185
-#: build/trans_presets.java:3192 build/trans_presets.java:3199
-#: build/trans_presets.java:3205 build/trans_presets.java:3214
-#: build/trans_presets.java:3221 build/trans_presets.java:3227
-#: build/trans_presets.java:3236 build/trans_presets.java:3245
-#: build/trans_presets.java:3251 build/trans_presets.java:3257
-#: build/trans_presets.java:3265 build/trans_presets.java:3272
-#: build/trans_presets.java:3279 build/trans_presets.java:3288
-#: build/trans_presets.java:3295 build/trans_presets.java:3301
-#: build/trans_presets.java:3310 build/trans_presets.java:3319
-#: build/trans_presets.java:3328 build/trans_presets.java:3334
-#: build/trans_presets.java:3343 build/trans_presets.java:3349
-#: build/trans_presets.java:3355 build/trans_presets.java:3364
-#: build/trans_presets.java:3370 build/trans_presets.java:3379
-#: build/trans_presets.java:3405 build/trans_presets.java:3413
-#: build/trans_presets.java:3428 build/trans_presets.java:3434
-#: build/trans_presets.java:3442 build/trans_presets.java:3476
+#: build/trans_presets.java:1522 build/trans_presets.java:1898
+#: build/trans_presets.java:1918 build/trans_presets.java:1935
+#: build/trans_presets.java:1954 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2023 build/trans_presets.java:2054
+#: build/trans_presets.java:2141 build/trans_presets.java:2148
+#: build/trans_presets.java:2164 build/trans_presets.java:2201
+#: build/trans_presets.java:2217 build/trans_presets.java:2240
+#: build/trans_presets.java:2274 build/trans_presets.java:2359
+#: build/trans_presets.java:2365 build/trans_presets.java:2373
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2561 build/trans_presets.java:2567
+#: build/trans_presets.java:3100 build/trans_presets.java:3108
+#: build/trans_presets.java:3157 build/trans_presets.java:3164
+#: build/trans_presets.java:3171 build/trans_presets.java:3179
+#: build/trans_presets.java:3186 build/trans_presets.java:3195
+#: build/trans_presets.java:3204 build/trans_presets.java:3211
+#: build/trans_presets.java:3221 build/trans_presets.java:3230
+#: build/trans_presets.java:3236 build/trans_presets.java:3244
+#: build/trans_presets.java:3250 build/trans_presets.java:3258
+#: build/trans_presets.java:3267 build/trans_presets.java:3273
+#: build/trans_presets.java:3280 build/trans_presets.java:3286
+#: build/trans_presets.java:3294 build/trans_presets.java:3301
+#: build/trans_presets.java:3307 build/trans_presets.java:3316
+#: build/trans_presets.java:3324 build/trans_presets.java:3330
+#: build/trans_presets.java:3339 build/trans_presets.java:3348
+#: build/trans_presets.java:3354 build/trans_presets.java:3360
+#: build/trans_presets.java:3370 build/trans_presets.java:3378
+#: build/trans_presets.java:3395 build/trans_presets.java:3404
+#: build/trans_presets.java:3411 build/trans_presets.java:3417
+#: build/trans_presets.java:3423 build/trans_presets.java:3432
+#: build/trans_presets.java:3441 build/trans_presets.java:3449
+#: build/trans_presets.java:3456 build/trans_presets.java:3464
+#: build/trans_presets.java:3471 build/trans_presets.java:3480
+#: build/trans_presets.java:3487 build/trans_presets.java:3496
+#: build/trans_presets.java:3505 build/trans_presets.java:3514
+#: build/trans_presets.java:3521 build/trans_presets.java:3530
+#: build/trans_presets.java:3536 build/trans_presets.java:3543
+#: build/trans_presets.java:3552 build/trans_presets.java:3558
+#: build/trans_presets.java:3567
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -25758,33 +26224,33 @@
 #: build/trans_presets.java:1470 build/trans_presets.java:1478
 #: build/trans_presets.java:1494 build/trans_presets.java:1503
-#: build/trans_presets.java:1522 build/trans_presets.java:1897
-#: build/trans_presets.java:1917 build/trans_presets.java:1934
-#: build/trans_presets.java:1953 build/trans_presets.java:1972
-#: build/trans_presets.java:1988 build/trans_presets.java:2005
-#: build/trans_presets.java:2022 build/trans_presets.java:2045
-#: build/trans_presets.java:2054 build/trans_presets.java:2061
-#: build/trans_presets.java:2104 build/trans_presets.java:2193
-#: build/trans_presets.java:2201 build/trans_presets.java:2316
-#: build/trans_presets.java:2322 build/trans_presets.java:2706
-#: build/trans_presets.java:2730 build/trans_presets.java:2994
-#: build/trans_presets.java:3001 build/trans_presets.java:3008
-#: build/trans_presets.java:3015 build/trans_presets.java:3022
-#: build/trans_presets.java:3029 build/trans_presets.java:3071
-#: build/trans_presets.java:3078 build/trans_presets.java:3084
-#: build/trans_presets.java:3092 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3157
-#: build/trans_presets.java:3172 build/trans_presets.java:3179
-#: build/trans_presets.java:3185 build/trans_presets.java:3192
-#: build/trans_presets.java:3199 build/trans_presets.java:3205
-#: build/trans_presets.java:3221 build/trans_presets.java:3227
-#: build/trans_presets.java:3251 build/trans_presets.java:3257
-#: build/trans_presets.java:3265 build/trans_presets.java:3272
-#: build/trans_presets.java:3279 build/trans_presets.java:3295
-#: build/trans_presets.java:3301 build/trans_presets.java:3334
-#: build/trans_presets.java:3349 build/trans_presets.java:3355
-#: build/trans_presets.java:3370 build/trans_presets.java:3405
-#: build/trans_presets.java:3413 build/trans_presets.java:3428
-#: build/trans_presets.java:3434 build/trans_presets.java:3442
-#: build/trans_presets.java:3476
+#: build/trans_presets.java:1522 build/trans_presets.java:1898
+#: build/trans_presets.java:1918 build/trans_presets.java:1935
+#: build/trans_presets.java:1954 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2023 build/trans_presets.java:2054
+#: build/trans_presets.java:2141 build/trans_presets.java:2148
+#: build/trans_presets.java:2201 build/trans_presets.java:2217
+#: build/trans_presets.java:2240 build/trans_presets.java:2359
+#: build/trans_presets.java:2365 build/trans_presets.java:2373
+#: build/trans_presets.java:2416 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:3100
+#: build/trans_presets.java:3108 build/trans_presets.java:3157
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3179 build/trans_presets.java:3186
+#: build/trans_presets.java:3211 build/trans_presets.java:3236
+#: build/trans_presets.java:3244 build/trans_presets.java:3250
+#: build/trans_presets.java:3258 build/trans_presets.java:3273
+#: build/trans_presets.java:3280 build/trans_presets.java:3286
+#: build/trans_presets.java:3294 build/trans_presets.java:3301
+#: build/trans_presets.java:3307 build/trans_presets.java:3324
+#: build/trans_presets.java:3330 build/trans_presets.java:3354
+#: build/trans_presets.java:3360 build/trans_presets.java:3370
+#: build/trans_presets.java:3378 build/trans_presets.java:3411
+#: build/trans_presets.java:3417 build/trans_presets.java:3423
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3464 build/trans_presets.java:3471
+#: build/trans_presets.java:3487 build/trans_presets.java:3521
+#: build/trans_presets.java:3536 build/trans_presets.java:3543
+#: build/trans_presets.java:3558
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
@@ -25942,5 +26408,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1479 build/trans_presets.java:1530
+#: build/trans_presets.java:1479 build/trans_presets.java:1531
 msgid "Contact:"
 msgstr ""
@@ -25949,19 +26415,19 @@
 #. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
 #. <space />
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Facilities/Accommodation/Hotel" text "Phone Number"
 #. <space />
-#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Facilities/Accommodation/Motel" text "Phone Number"
 #. <space />
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Facilities/Accommodation/Guest House" text "Phone Number"
 #. <space />
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Facilities/Accommodation/Chalet" text "Phone Number"
 #. <space />
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Facilities/Accommodation/Hostel" text "Phone Number"
 #. <space />
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Facilities/Accommodation/Alpine Hut" text "Phone Number"
 #. <space />
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Facilities/Accommodation/Caravan Site" text "Phone Number"
 #. <space />
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Facilities/Accommodation/Camping Site" text "Phone Number"
 #. <space />
 #. item "Food+Drinks/Restaurant" text "Phone Number"
@@ -25980,17 +26446,19 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Culture/Recording Studio" text "Phone Number"
 #. item "Health/Emergency Access Point" text "Phone Number"
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1480 build/trans_presets.java:1531
-#: build/trans_presets.java:1757 build/trans_presets.java:1775
-#: build/trans_presets.java:1791 build/trans_presets.java:1808
-#: build/trans_presets.java:1826 build/trans_presets.java:1843
-#: build/trans_presets.java:1865 build/trans_presets.java:1882
-#: build/trans_presets.java:1905 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_presets.java:1960
-#: build/trans_presets.java:1979 build/trans_presets.java:1995
-#: build/trans_presets.java:2012 build/trans_presets.java:2027
-#: build/trans_presets.java:3466 build/trans_presets.java:3887
+#: build/trans_presets.java:1480 build/trans_presets.java:1532
+#: build/trans_presets.java:1758 build/trans_presets.java:1776
+#: build/trans_presets.java:1792 build/trans_presets.java:1809
+#: build/trans_presets.java:1827 build/trans_presets.java:1844
+#: build/trans_presets.java:1866 build/trans_presets.java:1883
+#: build/trans_presets.java:1906 build/trans_presets.java:1925
+#: build/trans_presets.java:1942 build/trans_presets.java:1961
+#: build/trans_presets.java:1980 build/trans_presets.java:1996
+#: build/trans_presets.java:2013 build/trans_presets.java:2028
+#: build/trans_presets.java:2250 build/trans_presets.java:2406
+#: build/trans_presets.java:4009
 msgid "Phone Number"
 msgstr "Telefonnummer"
@@ -25998,12 +26466,12 @@
 #. item "Car/Tyres" text "Fax Number"
 #. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Facilities/Accommodation/Hotel" text "Fax Number"
+#. item "Facilities/Accommodation/Motel" text "Fax Number"
+#. item "Facilities/Accommodation/Guest House" text "Fax Number"
+#. item "Facilities/Accommodation/Chalet" text "Fax Number"
+#. item "Facilities/Accommodation/Hostel" text "Fax Number"
+#. item "Facilities/Accommodation/Alpine Hut" text "Fax Number"
+#. item "Facilities/Accommodation/Caravan Site" text "Fax Number"
+#. item "Facilities/Accommodation/Camping Site" text "Fax Number"
 #. item "Food+Drinks/Restaurant" text "Fax Number"
 #. item "Food+Drinks/Fast Food" text "Fax Number"
@@ -26015,14 +26483,14 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1481 build/trans_presets.java:1532
-#: build/trans_presets.java:1758 build/trans_presets.java:1776
-#: build/trans_presets.java:1792 build/trans_presets.java:1809
-#: build/trans_presets.java:1827 build/trans_presets.java:1844
-#: build/trans_presets.java:1866 build/trans_presets.java:1883
-#: build/trans_presets.java:1906 build/trans_presets.java:1925
-#: build/trans_presets.java:1942 build/trans_presets.java:1961
-#: build/trans_presets.java:1980 build/trans_presets.java:1996
-#: build/trans_presets.java:2013 build/trans_presets.java:2028
-#: build/trans_presets.java:3888
+#: build/trans_presets.java:1481 build/trans_presets.java:1533
+#: build/trans_presets.java:1759 build/trans_presets.java:1777
+#: build/trans_presets.java:1793 build/trans_presets.java:1810
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1867 build/trans_presets.java:1884
+#: build/trans_presets.java:1907 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1962
+#: build/trans_presets.java:1981 build/trans_presets.java:1997
+#: build/trans_presets.java:2014 build/trans_presets.java:2029
+#: build/trans_presets.java:4010
 msgid "Fax Number"
 msgstr ""
@@ -26030,12 +26498,12 @@
 #. item "Car/Tyres" text "Website"
 #. item "Motorcycle/Motorcycle Dealer" text "Website"
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Facilities/Accommodation/Hotel" text "Website"
+#. item "Facilities/Accommodation/Motel" text "Website"
+#. item "Facilities/Accommodation/Guest House" text "Website"
+#. item "Facilities/Accommodation/Chalet" text "Website"
+#. item "Facilities/Accommodation/Hostel" text "Website"
+#. item "Facilities/Accommodation/Alpine Hut" text "Website"
+#. item "Facilities/Accommodation/Caravan Site" text "Website"
+#. item "Facilities/Accommodation/Camping Site" text "Website"
 #. item "Food+Drinks/Restaurant" text "Website"
 #. item "Food+Drinks/Fast Food" text "Website"
@@ -26046,17 +26514,17 @@
 #. item "Food+Drinks/Bar" text "Website"
 #. item "Food+Drinks/Nightclub" text "Website"
-#. item "Man-Made/Buildings/Studio" text "Website"
+#. item "Culture/Recording Studio" text "Website"
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1482 build/trans_presets.java:1533
-#: build/trans_presets.java:1759 build/trans_presets.java:1777
-#: build/trans_presets.java:1793 build/trans_presets.java:1810
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1867 build/trans_presets.java:1884
-#: build/trans_presets.java:1907 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1962
-#: build/trans_presets.java:1981 build/trans_presets.java:1997
-#: build/trans_presets.java:2014 build/trans_presets.java:2029
-#: build/trans_presets.java:2657 build/trans_presets.java:3890
+#: build/trans_presets.java:1482 build/trans_presets.java:1534
+#: build/trans_presets.java:1760 build/trans_presets.java:1778
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1829 build/trans_presets.java:1846
+#: build/trans_presets.java:1868 build/trans_presets.java:1885
+#: build/trans_presets.java:1908 build/trans_presets.java:1927
+#: build/trans_presets.java:1944 build/trans_presets.java:1963
+#: build/trans_presets.java:1982 build/trans_presets.java:1998
+#: build/trans_presets.java:2015 build/trans_presets.java:2030
+#: build/trans_presets.java:2251 build/trans_presets.java:4012
 msgid "Website"
 msgstr ""
@@ -26064,12 +26532,12 @@
 #. item "Car/Tyres" text "Email Address"
 #. item "Motorcycle/Motorcycle Dealer" text "Email Address"
-#. item "Travel/Accomodation/Hotel" text "Email Address"
-#. item "Travel/Accomodation/Motel" text "Email Address"
-#. item "Travel/Accomodation/Guest House" text "Email Address"
-#. item "Travel/Accomodation/Chalet" text "Email Address"
-#. item "Travel/Accomodation/Hostel" text "Email Address"
-#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#. item "Facilities/Accommodation/Hotel" text "Email Address"
+#. item "Facilities/Accommodation/Motel" text "Email Address"
+#. item "Facilities/Accommodation/Guest House" text "Email Address"
+#. item "Facilities/Accommodation/Chalet" text "Email Address"
+#. item "Facilities/Accommodation/Hostel" text "Email Address"
+#. item "Facilities/Accommodation/Alpine Hut" text "Email Address"
+#. item "Facilities/Accommodation/Caravan Site" text "Email Address"
+#. item "Facilities/Accommodation/Camping Site" text "Email Address"
 #. item "Food+Drinks/Restaurant" text "Email Address"
 #. item "Food+Drinks/Fast Food" text "Email Address"
@@ -26081,14 +26549,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1483 build/trans_presets.java:1534
-#: build/trans_presets.java:1760 build/trans_presets.java:1778
-#: build/trans_presets.java:1794 build/trans_presets.java:1811
-#: build/trans_presets.java:1829 build/trans_presets.java:1846
-#: build/trans_presets.java:1868 build/trans_presets.java:1885
-#: build/trans_presets.java:1908 build/trans_presets.java:1927
-#: build/trans_presets.java:1944 build/trans_presets.java:1963
-#: build/trans_presets.java:1982 build/trans_presets.java:1998
-#: build/trans_presets.java:2015 build/trans_presets.java:2030
-#: build/trans_presets.java:3891
+#: build/trans_presets.java:1483 build/trans_presets.java:1535
+#: build/trans_presets.java:1761 build/trans_presets.java:1779
+#: build/trans_presets.java:1795 build/trans_presets.java:1812
+#: build/trans_presets.java:1830 build/trans_presets.java:1847
+#: build/trans_presets.java:1869 build/trans_presets.java:1886
+#: build/trans_presets.java:1909 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1964
+#: build/trans_presets.java:1983 build/trans_presets.java:1999
+#: build/trans_presets.java:2016 build/trans_presets.java:2031
+#: build/trans_presets.java:4013
 msgid "Email Address"
 msgstr ""
@@ -26099,5 +26567,5 @@
 #. item "Bicycle/Rental"
 #: build/trans_presets.java:1486 build/trans_presets.java:1525
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Rental"
 msgstr "Utleie"
@@ -26128,5 +26596,5 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1511 build/trans_presets.java:1543
+#: build/trans_presets.java:1511 build/trans_presets.java:1544
 msgid "Capacity"
 msgstr "Kapasitet"
@@ -26141,4 +26609,8 @@
 #: build/trans_presets.java:1517
 msgid "Edit Shop Motorcycle"
+msgstr ""
+
+#: build/trans_presets.java:1520
+msgid "independent"
 msgstr ""
 
@@ -26178,23 +26650,45 @@
 
 #: build/trans_presets.java:1525 build/trans_presets.java:1526
-#: build/trans_presets.java:1527 build/trans_presets.java:1528
+#: build/trans_presets.java:1528 build/trans_presets.java:1529
 msgid "brand"
 msgstr ""
 
-#: build/trans_presets.java:1526 build/trans_presets.java:1527
+#: build/trans_presets.java:1526 build/trans_presets.java:1528
 msgid "oldtimer"
 msgstr ""
 
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
+#: build/trans_presets.java:1527
+#, fuzzy
+msgid "Safety inspection"
+msgstr "Utvalg"
+
+#: build/trans_presets.java:1527
+msgid "DEKRA"
+msgstr ""
+
+#: build/trans_presets.java:1527
+msgid "GTÜ"
+msgstr ""
+
+#: build/trans_presets.java:1527
+msgid "MOT"
+msgstr ""
+
+#: build/trans_presets.java:1527
+msgid "TÜV"
+msgstr ""
+
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "Parts"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
-#. item "Amenities/Recycling" check "Clothes"
-#. <separator/>
-#. item "Shops/Clothes"
-#: build/trans_presets.java:1528 build/trans_presets.java:2942
-#: build/trans_presets.java:3153
+#. item "Facilities/Recycling" check "Clothes"
+#. group "Clothes"
+#. item "Clothes/Clothes"
+#: build/trans_presets.java:1529 build/trans_presets.java:2470
+#: build/trans_presets.java:3253 build/trans_presets.java:3254
 msgid "Clothes"
 msgstr "Klær"
@@ -26202,10 +26696,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1541
 msgid "Edit Bicycle Parking"
 msgstr "Rediger sykkelparkering"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1546
 msgid "Bike Dealer"
 msgstr "Sykkelforretning"
@@ -26214,5 +26708,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelforretning"
@@ -26221,10 +26715,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1556
 msgid "Edit Bicycle Rental"
 msgstr "Rediger sykkelutleie"
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1562
 msgctxt "railway"
 msgid "Station"
@@ -26234,5 +26728,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgctxt "railway"
 msgid "Edit Station"
@@ -26240,5 +26734,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1570
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -26246,5 +26740,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1573
 msgid "Railway Halt"
 msgstr ""
@@ -26252,5 +26746,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1575
 msgid "Edit Halt"
 msgstr "Rediger jernbanestopp"
@@ -26258,5 +26752,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1581
+#: build/trans_presets.java:1582
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -26265,5 +26759,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:1584
+#: build/trans_presets.java:1585
 msgid "Edit Tram Stop"
 msgstr "Rediger trikkestopp"
@@ -26271,5 +26765,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1592
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -26278,5 +26772,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:1594
+#: build/trans_presets.java:1595
 msgid "Edit Railway Platform"
 msgstr "Rediger jernbaneplattform"
@@ -26288,5 +26782,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1597 build/trans_presets.java:1642
+#: build/trans_presets.java:1598 build/trans_presets.java:1643
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -26294,10 +26788,10 @@
 #. item "Public Transport/Railway Platform" check "Area"
 #. item "Public Transport/Bus Platform" check "Area"
-#: build/trans_presets.java:1599 build/trans_presets.java:1644
+#: build/trans_presets.java:1600 build/trans_presets.java:1645
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1602
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -26306,11 +26800,11 @@
 #. 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:1604
+#: build/trans_presets.java:1605
 msgid "Edit Subway Entrance"
 msgstr "Rediger T-baneinngang"
 
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1609 build/trans_presets.java:2899
+#. item "Facilities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:1610 build/trans_presets.java:2427
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -26319,5 +26813,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -26326,5 +26820,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:1617
+#: build/trans_presets.java:1618
 msgid "Edit Bus Station"
 msgstr "Rediger busstasjon"
@@ -26332,5 +26826,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1624
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -26340,13 +26834,13 @@
 #. 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:1627
+#: build/trans_presets.java:1628
 msgid "Edit Bus Stop"
 msgstr "Rediger bussholdeplass"
 
 #. item "Public Transport/Bus Stop" combo "Shelter"
-#. item "Tourism/Shelter"
-#. item "Amenities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1632 build/trans_presets.java:2077
-#: build/trans_presets.java:2964
+#. item "Facilities/Shelter"
+#. item "Facilities/Hunting Stand" combo "Shelter"
+#: build/trans_presets.java:1633 build/trans_presets.java:2489
+#: build/trans_presets.java:2499
 msgid "Shelter"
 msgstr "Ly"
@@ -26354,11 +26848,12 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. <key key="amenity" value="waste_basket" />
-#. item "Amenities/Bench"
-#: build/trans_presets.java:1633 build/trans_presets.java:2952
+#. <separator/>
+#. item "Facilities/Bench"
+#: build/trans_presets.java:1634 build/trans_presets.java:2481
 msgid "Bench"
 msgstr "Benk"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Tactile Paving"
 msgstr ""
@@ -26366,10 +26861,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1639
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1640
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -26377,10 +26872,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Ticket Machine"
 msgstr ""
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 #, fuzzy
 msgid "Reference Number"
@@ -26388,51 +26883,51 @@
 
 #. item "Public Transport/Ticket Machine" check "Coins"
-#. item "Amenities/Telephone" check "Coins"
-#. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:1654 build/trans_presets.java:2913
-#: build/trans_presets.java:3390
+#. item "Facilities/Telephone" check "Coins"
+#. item "Vending machine" check "Coins"
+#: build/trans_presets.java:1655 build/trans_presets.java:2441
+#: build/trans_presets.java:3578
 msgid "Coins"
 msgstr "Mynter"
 
 #. item "Public Transport/Ticket Machine" check "Notes"
-#. item "Amenities/Telephone" check "Notes"
-#. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:1655 build/trans_presets.java:2914
-#: build/trans_presets.java:3391
+#. item "Facilities/Telephone" check "Notes"
+#. item "Vending machine" check "Notes"
+#: build/trans_presets.java:1656 build/trans_presets.java:2442
+#: build/trans_presets.java:3579
 msgid "Notes"
 msgstr "Sedler"
 
 #. item "Public Transport/Ticket Machine" check "Electronic purses and Charge cards"
-#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
-#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1656 build/trans_presets.java:2915
-#: build/trans_presets.java:3392
+#. item "Facilities/Telephone" check "Electronic purses and Charge cards"
+#. item "Vending machine" check "Electronic purses and Charge cards"
+#: build/trans_presets.java:1657 build/trans_presets.java:2443
+#: build/trans_presets.java:3580
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
 
 #. item "Public Transport/Ticket Machine" check "Debit cards"
-#. item "Amenities/Telephone" check "Debit cards"
-#. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:1657 build/trans_presets.java:2916
-#: build/trans_presets.java:3393
+#. item "Facilities/Telephone" check "Debit cards"
+#. item "Vending machine" check "Debit cards"
+#: build/trans_presets.java:1658 build/trans_presets.java:2444
+#: build/trans_presets.java:3581
 msgid "Debit cards"
 msgstr "Bankkort"
 
 #. item "Public Transport/Ticket Machine" check "Credit cards"
-#. item "Amenities/Telephone" check "Credit cards"
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:1658 build/trans_presets.java:2917
-#: build/trans_presets.java:3394
+#. item "Facilities/Telephone" check "Credit cards"
+#. item "Vending machine" check "Credit cards"
+#: build/trans_presets.java:1659 build/trans_presets.java:2445
+#: build/trans_presets.java:3582
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1659 build/trans_presets.java:3395
+#. item "Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:1660 build/trans_presets.java:3583
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Taxi"
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1663
 msgid "Taxi"
 msgstr "Taxi"
@@ -26440,5 +26935,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1665
 msgid "Edit Taxi station"
 msgstr "Rediger taxi-stasjon"
@@ -26446,10 +26941,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1670
 msgid "Airport"
 msgstr "Flyplass"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1671
 msgid "Airport Ground"
 msgstr ""
@@ -26457,5 +26952,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1673
 msgid "Edit Airport Ground"
 msgstr ""
@@ -26463,10 +26958,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1677
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1678
 msgid "ICAO"
 msgstr "ICAO"
@@ -26475,5 +26970,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1683
 msgid "Runway"
 msgstr "Rullebane"
@@ -26481,5 +26976,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:1685
 msgid "Edit Runway"
 msgstr "Rediger rullebane"
@@ -26487,5 +26982,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1691
 msgid "Taxiway"
 msgstr "Taksebane"
@@ -26493,5 +26988,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1693
 msgid "Edit Taxiway"
 msgstr "Rediger taksebane"
@@ -26499,5 +26994,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1699
 msgid "Helipad"
 msgstr "Helikopterdekk"
@@ -26505,5 +27000,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1701
 msgid "Edit Helipad"
 msgstr "Rediger helikopterdekk"
@@ -26513,5 +27008,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1706 build/trans_presets.java:1708
+#: build/trans_presets.java:1707 build/trans_presets.java:1709
 msgid "Apron"
 msgstr "Oppstillingsplass"
@@ -26521,5 +27016,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1711 build/trans_presets.java:1713
+#: build/trans_presets.java:1712 build/trans_presets.java:1714
 msgid "Hangar"
 msgstr "Hangar"
@@ -26529,7 +27024,7 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Airport/Beacon" label "Beacon"
-#. item "Man Made/Beacon"
-#: build/trans_presets.java:1716 build/trans_presets.java:1718
-#: build/trans_presets.java:2823
+#. item "Man Made/Man Made/Beacon"
+#: build/trans_presets.java:1717 build/trans_presets.java:1719
+#: build/trans_presets.java:2984
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -26539,5 +27034,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1721 build/trans_presets.java:1723
+#: build/trans_presets.java:1722 build/trans_presets.java:1724
 msgid "Windsock"
 msgstr "Vindpølse"
@@ -26546,5 +27041,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1728
 msgid "Terminal"
 msgstr "Terminal"
@@ -26552,10 +27047,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1730
 msgid "Edit Terminal"
 msgstr "Rediger terminal"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1734
 msgctxt "airport"
 msgid "Gate"
@@ -26564,19 +27059,21 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Edit Terminal Gate"
 msgstr "Rediger terminalutgang"
 
-#. group "Travel"
-#: build/trans_presets.java:1741
-msgid "Travel"
-msgstr "Reise"
-
-#. group "Travel/Accomodation"
-#: build/trans_presets.java:1742
-msgid "Accomodation"
+#. group "Facilities"
+#: build/trans_presets.java:1742 build/trans_presets.java:2419
+#, fuzzy
+msgid "Facilities"
+msgstr "Sport"
+
+#. group "Facilities/Accommodation"
+#: build/trans_presets.java:1743
+#, fuzzy
+msgid "Accommodation"
 msgstr "Overnatting"
 
-#. item "Travel/Accomodation/Hotel"
+#. item "Facilities/Accommodation/Hotel"
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -26584,5 +27081,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1743 build/trans_surveyor.java:43
+#: build/trans_presets.java:1744 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -26590,40 +27087,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1746
+#. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
+#: build/trans_presets.java:1747
 msgid "Edit Hotel"
 msgstr "Rediger hotell"
 
-#. item "Travel/Accomodation/Hotel" combo "Stars"
-#. item "Travel/Accomodation/Motel" combo "Stars"
-#. item "Travel/Accomodation/Guest House" combo "Stars"
-#. item "Travel/Accomodation/Chalet" combo "Stars"
-#. item "Travel/Accomodation/Hostel" combo "Stars"
-#. item "Travel/Accomodation/Caravan Site" combo "Stars"
-#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. item "Facilities/Accommodation/Hotel" combo "Stars"
+#. item "Facilities/Accommodation/Motel" combo "Stars"
+#. item "Facilities/Accommodation/Guest House" combo "Stars"
+#. item "Facilities/Accommodation/Chalet" combo "Stars"
+#. item "Facilities/Accommodation/Hostel" combo "Stars"
+#. item "Facilities/Accommodation/Caravan Site" combo "Stars"
+#. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1750 build/trans_presets.java:1768
-#: build/trans_presets.java:1784 build/trans_presets.java:1801
-#: build/trans_presets.java:1819 build/trans_presets.java:1853
-#: build/trans_presets.java:1875 build/trans_presets.java:1898
+#: build/trans_presets.java:1751 build/trans_presets.java:1769
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1820 build/trans_presets.java:1854
+#: build/trans_presets.java:1876 build/trans_presets.java:1899
 msgid "Stars"
 msgstr "Stjerner"
 
 #. <space />
-#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Facilities/Accommodation/Hotel" combo "Internet access"
 #. <space />
-#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Facilities/Accommodation/Motel" combo "Internet access"
 #. <space />
-#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Facilities/Accommodation/Guest House" combo "Internet access"
 #. <space />
-#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Facilities/Accommodation/Chalet" combo "Internet access"
 #. <space />
-#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Facilities/Accommodation/Hostel" combo "Internet access"
 #. <space />
-#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access"
 #. <space />
-#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access"
 #. <space />
-#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access"
 #. <space />
 #. item "Food+Drinks/Restaurant" combo "Internet access"
@@ -26640,71 +27137,4 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1752 build/trans_presets.java:1770
-#: build/trans_presets.java:1786 build/trans_presets.java:1803
-#: build/trans_presets.java:1821 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1877
-#: build/trans_presets.java:1900 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1955
-#: build/trans_presets.java:1974 build/trans_presets.java:1990
-#: build/trans_presets.java:2007
-msgid "Internet access"
-msgstr ""
-
-#: build/trans_presets.java:1752 build/trans_presets.java:1770
-#: build/trans_presets.java:1786 build/trans_presets.java:1803
-#: build/trans_presets.java:1821 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1877
-#: build/trans_presets.java:1900 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1955
-#: build/trans_presets.java:1974 build/trans_presets.java:1990
-#: build/trans_presets.java:2007
-msgid "wlan"
-msgstr ""
-
-#: build/trans_presets.java:1752 build/trans_presets.java:1770
-#: build/trans_presets.java:1786 build/trans_presets.java:1803
-#: build/trans_presets.java:1821 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1877
-#: build/trans_presets.java:1900 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1955
-#: build/trans_presets.java:1974 build/trans_presets.java:1990
-#: build/trans_presets.java:2007
-msgid "wired"
-msgstr ""
-
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#. color terminal
-#: build/trans_presets.java:1752 build/trans_presets.java:1770
-#: build/trans_presets.java:1786 build/trans_presets.java:1803
-#: build/trans_presets.java:1821 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1877
-#: build/trans_presets.java:1900 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1955
-#: build/trans_presets.java:1974 build/trans_presets.java:1990
-#: build/trans_presets.java:2007 build/trans_style.java:1413
-msgid "terminal"
-msgstr "stasjon"
-
-#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
-#. item "Travel/Accomodation/Motel" combo "Internet access fee"
-#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
-#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
-#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
-#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
-#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
-#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
-#. item "Food+Drinks/Restaurant" combo "Internet access fee"
-#. item "Food+Drinks/Fast Food" combo "Internet access fee"
-#. item "Food+Drinks/Food Court" combo "Internet access fee"
-#. item "Food+Drinks/Cafe" combo "Internet access fee"
-#. item "Food+Drinks/Pub" combo "Internet access fee"
-#. item "Food+Drinks/Biergarten" combo "Internet access fee"
-#. item "Food+Drinks/Bar" combo "Internet access fee"
 #: build/trans_presets.java:1753 build/trans_presets.java:1771
 #: build/trans_presets.java:1787 build/trans_presets.java:1804
@@ -26715,15 +27145,82 @@
 #: build/trans_presets.java:1975 build/trans_presets.java:1991
 #: build/trans_presets.java:2008
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1753 build/trans_presets.java:1771
+#: build/trans_presets.java:1787 build/trans_presets.java:1804
+#: build/trans_presets.java:1822 build/trans_presets.java:1839
+#: build/trans_presets.java:1856 build/trans_presets.java:1878
+#: build/trans_presets.java:1901 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1956
+#: build/trans_presets.java:1975 build/trans_presets.java:1991
+#: build/trans_presets.java:2008
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1753 build/trans_presets.java:1771
+#: build/trans_presets.java:1787 build/trans_presets.java:1804
+#: build/trans_presets.java:1822 build/trans_presets.java:1839
+#: build/trans_presets.java:1856 build/trans_presets.java:1878
+#: build/trans_presets.java:1901 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1956
+#: build/trans_presets.java:1975 build/trans_presets.java:1991
+#: build/trans_presets.java:2008
+msgid "wired"
+msgstr ""
+
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#. color terminal
+#: build/trans_presets.java:1753 build/trans_presets.java:1771
+#: build/trans_presets.java:1787 build/trans_presets.java:1804
+#: build/trans_presets.java:1822 build/trans_presets.java:1839
+#: build/trans_presets.java:1856 build/trans_presets.java:1878
+#: build/trans_presets.java:1901 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1956
+#: build/trans_presets.java:1975 build/trans_presets.java:1991
+#: build/trans_presets.java:2008 build/trans_style.java:1414
+msgid "terminal"
+msgstr "stasjon"
+
+#. item "Facilities/Accommodation/Hotel" combo "Internet access fee"
+#. item "Facilities/Accommodation/Motel" combo "Internet access fee"
+#. item "Facilities/Accommodation/Guest House" combo "Internet access fee"
+#. item "Facilities/Accommodation/Chalet" combo "Internet access fee"
+#. item "Facilities/Accommodation/Hostel" combo "Internet access fee"
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access fee"
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access fee"
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#: build/trans_presets.java:1754 build/trans_presets.java:1772
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1823 build/trans_presets.java:1840
+#: build/trans_presets.java:1857 build/trans_presets.java:1879
+#: build/trans_presets.java:1902 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1957
+#: build/trans_presets.java:1976 build/trans_presets.java:1992
+#: build/trans_presets.java:2009
 msgid "Internet access fee"
 msgstr ""
 
-#. item "Travel/Accomodation/Hotel" combo "Smoking"
-#. item "Travel/Accomodation/Motel" combo "Smoking"
-#. item "Travel/Accomodation/Guest House" combo "Smoking"
-#. item "Travel/Accomodation/Chalet" combo "Smoking"
-#. item "Travel/Accomodation/Hostel" combo "Smoking"
-#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
-#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
-#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Facilities/Accommodation/Hotel" combo "Smoking"
+#. item "Facilities/Accommodation/Motel" combo "Smoking"
+#. item "Facilities/Accommodation/Guest House" combo "Smoking"
+#. item "Facilities/Accommodation/Chalet" combo "Smoking"
+#. item "Facilities/Accommodation/Hostel" combo "Smoking"
+#. item "Facilities/Accommodation/Alpine Hut" combo "Smoking"
+#. item "Facilities/Accommodation/Caravan Site" combo "Smoking"
+#. item "Facilities/Accommodation/Camping Site" combo "Smoking"
 #. item "Food+Drinks/Restaurant" combo "Smoking"
 #. item "Food+Drinks/Fast Food" combo "Smoking"
@@ -26735,150 +27232,150 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1754 build/trans_presets.java:1772
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1823 build/trans_presets.java:1840
-#: build/trans_presets.java:1857 build/trans_presets.java:1879
-#: build/trans_presets.java:1902 build/trans_presets.java:1921
-#: build/trans_presets.java:1938 build/trans_presets.java:1957
-#: build/trans_presets.java:1976 build/trans_presets.java:1992
-#: build/trans_presets.java:2009 build/trans_presets.java:2024
+#: build/trans_presets.java:1755 build/trans_presets.java:1773
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1824 build/trans_presets.java:1841
+#: build/trans_presets.java:1858 build/trans_presets.java:1880
+#: build/trans_presets.java:1903 build/trans_presets.java:1922
+#: build/trans_presets.java:1939 build/trans_presets.java:1958
+#: build/trans_presets.java:1977 build/trans_presets.java:1993
+#: build/trans_presets.java:2010 build/trans_presets.java:2025
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1754 build/trans_presets.java:1772
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1823 build/trans_presets.java:1840
-#: build/trans_presets.java:1857 build/trans_presets.java:1879
-#: build/trans_presets.java:1902 build/trans_presets.java:1921
-#: build/trans_presets.java:1938 build/trans_presets.java:1957
-#: build/trans_presets.java:1976 build/trans_presets.java:1992
-#: build/trans_presets.java:2009 build/trans_presets.java:2024
+#: build/trans_presets.java:1755 build/trans_presets.java:1773
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1824 build/trans_presets.java:1841
+#: build/trans_presets.java:1858 build/trans_presets.java:1880
+#: build/trans_presets.java:1903 build/trans_presets.java:1922
+#: build/trans_presets.java:1939 build/trans_presets.java:1958
+#: build/trans_presets.java:1977 build/trans_presets.java:1993
+#: build/trans_presets.java:2010 build/trans_presets.java:2025
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1754 build/trans_presets.java:1772
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1823 build/trans_presets.java:1840
-#: build/trans_presets.java:1857 build/trans_presets.java:1879
-#: build/trans_presets.java:1902 build/trans_presets.java:1921
-#: build/trans_presets.java:1938 build/trans_presets.java:1957
-#: build/trans_presets.java:1976 build/trans_presets.java:1992
-#: build/trans_presets.java:2009 build/trans_presets.java:2024
+#: build/trans_presets.java:1755 build/trans_presets.java:1773
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1824 build/trans_presets.java:1841
+#: build/trans_presets.java:1858 build/trans_presets.java:1880
+#: build/trans_presets.java:1903 build/trans_presets.java:1922
+#: build/trans_presets.java:1939 build/trans_presets.java:1958
+#: build/trans_presets.java:1977 build/trans_presets.java:1993
+#: build/trans_presets.java:2010 build/trans_presets.java:2025
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1754 build/trans_presets.java:1772
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1823 build/trans_presets.java:1840
-#: build/trans_presets.java:1857 build/trans_presets.java:1879
-#: build/trans_presets.java:1902 build/trans_presets.java:1921
-#: build/trans_presets.java:1938 build/trans_presets.java:1957
-#: build/trans_presets.java:1976 build/trans_presets.java:1992
-#: build/trans_presets.java:2009 build/trans_presets.java:2024
+#: build/trans_presets.java:1755 build/trans_presets.java:1773
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1824 build/trans_presets.java:1841
+#: build/trans_presets.java:1858 build/trans_presets.java:1880
+#: build/trans_presets.java:1903 build/trans_presets.java:1922
+#: build/trans_presets.java:1939 build/trans_presets.java:1958
+#: build/trans_presets.java:1977 build/trans_presets.java:1993
+#: build/trans_presets.java:2010 build/trans_presets.java:2025
 msgid "isolated"
 msgstr ""
 
-#. item "Travel/Accomodation/Motel"
-#: build/trans_presets.java:1762
+#. item "Facilities/Accommodation/Motel"
+#: build/trans_presets.java:1763
 msgid "Motel"
 msgstr "Motell"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#. item "Travel/Accomodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1764
+#. item "Facilities/Accommodation/Motel" label "Edit Motel"
+#: build/trans_presets.java:1765
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
-#. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1780
+#. item "Facilities/Accommodation/Guest House"
+#: build/trans_presets.java:1781
 msgid "Guest House"
 msgstr "Gjestehus"
 
-#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1781
+#. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
+#: build/trans_presets.java:1782
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
-#. item "Travel/Accomodation/Chalet"
-#: build/trans_presets.java:1796
+#. item "Facilities/Accommodation/Chalet"
+#: build/trans_presets.java:1797
 msgid "Chalet"
 msgstr "Feriehytter"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1798
+#. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
+#: build/trans_presets.java:1799
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
-#. item "Travel/Accomodation/Hostel"
-#: build/trans_presets.java:1813
+#. item "Facilities/Accommodation/Hostel"
+#: build/trans_presets.java:1814
 msgid "Hostel"
 msgstr "Ungdomsherberge"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:1815
+#. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
+#: build/trans_presets.java:1816
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1831
+#. item "Facilities/Accommodation/Alpine Hut"
+#: build/trans_presets.java:1832
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
-#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:1832
+#. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
+#: build/trans_presets.java:1833
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
 
 #. <separator/>
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1849
+#. item "Facilities/Accommodation/Caravan Site"
+#: build/trans_presets.java:1850
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
-#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:1850
+#. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
+#: build/trans_presets.java:1851
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
 
 #. <space />
-#. item "Travel/Accomodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:1860
+#. item "Facilities/Accommodation/Caravan Site" text "Number of places"
+#: build/trans_presets.java:1861
 msgid "Number of places"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:1861
+#. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
+#: build/trans_presets.java:1862
 msgid "Requires a fee"
 msgstr ""
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1862
 msgid "interval"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:1862
+#. item "Facilities/Accommodation/Caravan Site" check "Power supply"
+#: build/trans_presets.java:1863
 msgid "Power supply"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:1863
+#. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
+#: build/trans_presets.java:1864
 msgid "Tents allowed"
 msgstr ""
 
-#. item "Travel/Accomodation/Camping Site"
-#: build/trans_presets.java:1870
+#. item "Facilities/Accommodation/Camping Site"
+#: build/trans_presets.java:1871
 msgid "Camping Site"
 msgstr "Campingplass"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:1872
+#. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
+#: build/trans_presets.java:1873
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1889
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -26889,5 +27386,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:1889 build/trans_surveyor.java:47
+#: build/trans_presets.java:1890 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26895,5 +27392,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
@@ -26902,74 +27399,74 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
+#: build/trans_presets.java:1953
 msgid "Cuisine"
 msgstr "Kjøkken"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1896 build/trans_presets.java:1917
 msgid "sushi"
 msgstr ""
@@ -26977,10 +27474,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1896 build/trans_presets.java:1971
+#: build/trans_presets.java:1897 build/trans_presets.java:1972
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -26988,18 +27485,18 @@
 #. <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:1912
+#: build/trans_presets.java:1913
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1930
 msgid "Food Court"
 msgstr ""
@@ -27007,10 +27504,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:1931
+#: build/trans_presets.java:1932
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Cafe"
 msgstr "Kafé"
@@ -27018,14 +27515,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1949
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "ice_cream"
 msgstr ""
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Pub"
 msgstr "Pub"
@@ -27033,20 +27530,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1968
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1985
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1986
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Bar"
 msgstr "Bar"
@@ -27054,10 +27551,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:2003
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2018
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -27065,36 +27562,262 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
 #. group "Tourism"
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2034
 msgid "Tourism"
 msgstr "Turisme"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2035
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2036
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
-#. item "Tourism/Museum"
-#: build/trans_presets.java:2040
-msgid "Museum"
-msgstr "Museum"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#. item "Tourism/Museum" label "Edit Museum"
-#: build/trans_presets.java:2042
-msgid "Edit Museum"
-msgstr "Rediger museum"
-
-#. item "Tourism/Zoo"
-#: build/trans_presets.java:2048
+#. item "Tourism/Viewpoint"
+#: build/trans_presets.java:2041
+msgid "Viewpoint"
+msgstr "Utsiktspunkt"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#: build/trans_presets.java:2043
+msgid "Edit Viewpoint"
+msgstr "Rediger utsiktspunkt"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:2046
+msgid "Look-Out Tower"
+msgstr "Utsiktstårn"
+
+#. <separator/>
+#. item "Tourism/Information Office"
+#: build/trans_presets.java:2049
+msgid "Information Office"
+msgstr "Turistinformasjon"
+
+#. item "Tourism/Map"
+#: build/trans_presets.java:2056
+msgid "Map"
+msgstr "Kart"
+
+#. item "Tourism/Map" combo "Detail Grade"
+#: build/trans_presets.java:2061
+msgid "Detail Grade"
+msgstr "Karttype"
+
+#: build/trans_presets.java:2061
+msgid "topo"
+msgstr "Topografisk"
+
+#. <roles>
+#. item "Relations/Associated street" role "street"
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unclassified"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unsurfaced"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>20000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="residential"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="living_street"/>
+#. color street
+#: build/trans_presets.java:2061 build/trans_presets.java:4112
+#: build/trans_style.java:626 build/trans_style.java:642
+#: build/trans_style.java:658 build/trans_style.java:666
+msgid "street"
+msgstr "Gater"
+
+#: build/trans_presets.java:2061
+msgid "scheme"
+msgstr "Diagram"
+
+#. item "Tourism/Map" combo "Shown Area"
+#: build/trans_presets.java:2062
+msgid "Shown Area"
+msgstr "Synlig område"
+
+#: build/trans_presets.java:2062
+msgid "site"
+msgstr "Sted"
+
+#: build/trans_presets.java:2062
+msgid "city"
+msgstr "By"
+
+#: build/trans_presets.java:2062
+msgid "region"
+msgstr "Region"
+
+#. item "Tourism/Map" text "Closer Description"
+#. item "Tourism/Information Board" text "Closer Description"
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2063 build/trans_presets.java:2079
+#: build/trans_presets.java:2124
+msgid "Closer Description"
+msgstr "Nærmere forklaring"
+
+#. <space />
+#. item "Tourism/Map" label "Routes shown for:"
+#. <space />
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:2065 build/trans_presets.java:2088
+msgid "Routes shown for:"
+msgstr "Ruter for:"
+
+#. item "Tourism/Map" check "Hiking"
+#. item "Tourism/Guidepost" check "Hiking"
+#: build/trans_presets.java:2066 build/trans_presets.java:2089
+msgid "Hiking"
+msgstr "Tursti"
+
+#. item "Tourism/Map" check "Cycling"
+#. item "Tourism/Guidepost" check "Cycling"
+#. item "Sport/Cycling"
+#: build/trans_presets.java:2067 build/trans_presets.java:2090
+#: build/trans_presets.java:2607
+msgid "Cycling"
+msgstr "Sykling"
+
+#. item "Tourism/Map" check "Mountainbiking"
+#. item "Tourism/Guidepost" check "Mountainbiking"
+#: build/trans_presets.java:2068 build/trans_presets.java:2091
+msgid "Mountainbiking"
+msgstr "Fjellsykling"
+
+#. item "Tourism/Map" check "Skiing"
+#. item "Tourism/Guidepost" check "Skiing"
+#. item "Sport/Skiing"
+#: build/trans_presets.java:2069 build/trans_presets.java:2092
+#: build/trans_presets.java:2093 build/trans_presets.java:2655
+msgid "Skiing"
+msgstr "Ski"
+
+#. item "Tourism/Map" check "Riding"
+#. item "Tourism/Guidepost" check "Riding"
+#: build/trans_presets.java:2070 build/trans_presets.java:2094
+msgid "Riding"
+msgstr "Riding"
+
+#. item "Tourism/Map" label "... other transportation modes possible"
+#. item "Tourism/Guidepost" label "... other transportation modes possible"
+#: build/trans_presets.java:2071 build/trans_presets.java:2095
+msgid "... other transportation modes possible"
+msgstr "… andre typer transport mulig"
+
+#. item "Tourism/Information Board"
+#: build/trans_presets.java:2073
+msgid "Information Board"
+msgstr "Informasjonstavle"
+
+#. item "Tourism/Information Board" combo "Board Content"
+#: build/trans_presets.java:2078
+msgid "Board Content"
+msgstr "Tavleinnhold"
+
+#: build/trans_presets.java:2078
+msgid "notice"
+msgstr "Merknad"
+
+#: build/trans_presets.java:2078
+msgid "history"
+msgstr "Historisk"
+
+#: build/trans_presets.java:2078
+msgid "nature"
+msgstr "Natur"
+
+#: build/trans_presets.java:2078
+msgid "wildlife"
+msgstr "Dyreliv"
+
+#: build/trans_presets.java:2078
+msgid "plants"
+msgstr "Planter"
+
+#. item "Tourism/Guidepost"
+#: build/trans_presets.java:2081
+msgid "Guidepost"
+msgstr "Veiviser"
+
+#. item "Tourism/Information Terminal"
+#: build/trans_presets.java:2097
+msgid "Information Terminal"
+msgstr "Informasjonsterminal"
+
+#. item "Tourism/Information Terminal" text "Closer description"
+#. item "Tourism/Audioguide" text "Closer description"
+#: build/trans_presets.java:2102 build/trans_presets.java:2112
+msgid "Closer description"
+msgstr "Nærmere beskrivelse"
+
+#. item "Tourism/Audioguide"
+#: build/trans_presets.java:2107
+msgid "Audioguide"
+msgstr "Lydomviser"
+
+#. <space />
+#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
+#: build/trans_presets.java:2117
+msgid "Audioguide via mobile phone?"
+msgstr "Lydomvisning via mobiltelefon"
+
+#. item "Tourism/Audioguide" text "Phone number"
+#: build/trans_presets.java:2118
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#. item "Tourism/Other Information Points"
+#: build/trans_presets.java:2120
+msgid "Other Information Points"
+msgstr "Annen informasjon"
+
+#. group "Leisure"
+#: build/trans_presets.java:2127
+msgid "Leisure"
+msgstr "Fritid"
+
+#. item "Leisure/Cinema"
+#: build/trans_presets.java:2128
+msgid "Cinema"
+msgstr "Kino"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
+#. item "Leisure/Cinema" label "Edit Cinema"
+#: build/trans_presets.java:2131
+msgid "Edit Cinema"
+msgstr "Rediger kino"
+
+#. item "Leisure/Zoo"
+#: build/trans_presets.java:2135
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -27102,70 +27825,88 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#. item "Tourism/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2051
+#. item "Leisure/Zoo" label "Edit Zoo"
+#: build/trans_presets.java:2138
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:2057
+#. item "Leisure/Theme Park"
+#: build/trans_presets.java:2144
 msgid "Theme Park"
 msgstr "Temapark"
 
-#. item "Tourism/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2058
+#. item "Leisure/Theme Park" label "Edit Theme Park"
+#: build/trans_presets.java:2145
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
-#. item "Tourism/Artwork"
-#: build/trans_presets.java:2063
-msgid "Artwork"
-msgstr "Kunstverk"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#. item "Tourism/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2065
-msgid "Edit Artwork"
-msgstr "Rediger kunstverk"
+#. item "Leisure/Water Park"
+#: build/trans_presets.java:2150
+msgid "Water Park"
+msgstr "Badepark"
+
+#. item "Leisure/Water Park" label "Edit Water Park"
+#: build/trans_presets.java:2151
+msgid "Edit Water Park"
+msgstr "Rediger badepark"
+
+#. item "Leisure/Sauna"
+#: build/trans_presets.java:2155
+#, fuzzy
+msgid "Sauna"
+msgstr "Kanal"
+
+#. item "Leisure/Sauna" label "Edit Sauna"
+#. <space />
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
+#. item "Leisure/Sauna" label "Edit Sauna"
+#: build/trans_presets.java:2156 build/trans_presets.java:2159
+#, fuzzy
+msgid "Edit Sauna"
+msgstr "Rediger kanal"
+
+#: build/trans_presets.java:2164 build/trans_presets.java:2274
+#: build/trans_presets.java:2382 build/trans_presets.java:3195
+#: build/trans_presets.java:3204 build/trans_presets.java:3221
+#: build/trans_presets.java:3230 build/trans_presets.java:3267
+#: build/trans_presets.java:3316 build/trans_presets.java:3339
+#: build/trans_presets.java:3348 build/trans_presets.java:3395
+#: build/trans_presets.java:3404 build/trans_presets.java:3432
+#: build/trans_presets.java:3441 build/trans_presets.java:3480
+#: build/trans_presets.java:3496 build/trans_presets.java:3505
+#: build/trans_presets.java:3514 build/trans_presets.java:3530
+#: build/trans_presets.java:3552 build/trans_presets.java:3567
+msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
 
 #. <separator/>
-#. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2070
-msgid "Viewpoint"
-msgstr "Utsiktspunkt"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2072
-msgid "Edit Viewpoint"
-msgstr "Rediger utsiktspunkt"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2075
-msgid "Look-Out Tower"
-msgstr "Utsiktstårn"
-
-#. item "Tourism/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2078
-msgid "Edit Shelter"
-msgstr "Rediger ly"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#. item "Leisure/Playground"
+#: build/trans_presets.java:2168
+msgid "Playground"
+msgstr "Lekeplass"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
+#. item "Leisure/Playground" label "Edit Playground"
+#: build/trans_presets.java:2170
+msgid "Edit Playground"
+msgstr "Rediger lekeplass"
+
+#. item "Leisure/Picnic Site"
+#: build/trans_presets.java:2174
+msgid "Picnic Site"
+msgstr "Piknik-sted"
+
+#. item "Leisure/Picnic Site" label "Edit Picnic Site"
+#: build/trans_presets.java:2175
+msgid "Edit Picnic Site"
+msgstr "Rediger piknik-sted"
+
+#. item "Leisure/Picnic Site" check "Fireplace"
+#. item "Facilities/Shelter" check "Fireplace"
+#: build/trans_presets.java:2178 build/trans_presets.java:2493
 msgid "Fireplace"
 msgstr "Bålplass"
 
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2083
-msgid "Picnic Site"
-msgstr "Piknik-sted"
-
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2084
-msgid "Edit Picnic Site"
-msgstr "Rediger piknik-sted"
-
-#. item "Tourism/Public Grill"
-#: build/trans_presets.java:2089
+#. item "Leisure/Public Grill"
+#: build/trans_presets.java:2180
 #, fuzzy
 msgid "Public Grill"
@@ -27173,18 +27914,18 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
-#. item "Tourism/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2091
+#. item "Leisure/Public Grill" label "Edit Public Grill"
+#: build/trans_presets.java:2182
 #, fuzzy
 msgid "Edit Public Grill"
 msgstr "Rediger offentlig bygning"
 
-#. item "Tourism/Public Grill" combo "Covered"
-#: build/trans_presets.java:2095
+#. item "Leisure/Public Grill" combo "Covered"
+#: build/trans_presets.java:2186
 #, fuzzy
 msgid "Covered"
 msgstr "Tilkoblet"
 
-#. item "Tourism/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2096
+#. item "Leisure/Public Grill" combo "Fuel"
+#: build/trans_presets.java:2187
 #, fuzzy
 msgctxt "grill"
@@ -27192,426 +27933,972 @@
 msgstr "Bensinstasjon"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2187
 #, fuzzy
 msgid "charcoal"
 msgstr "kull"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2187
 #, fuzzy
 msgid "electric"
 msgstr "Elektronikk"
 
-#. <separator/>
-#. item "Tourism/Information Office"
-#: build/trans_presets.java:2099
-msgid "Information Office"
-msgstr "Turistinformasjon"
-
-#. item "Tourism/Map"
-#: build/trans_presets.java:2106
-msgid "Map"
-msgstr "Kart"
-
-#. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2111
-msgid "Detail Grade"
-msgstr "Karttype"
-
-#: build/trans_presets.java:2111
-msgid "topo"
-msgstr "Topografisk"
-
-#. <roles>
-#. item "Relations/Associated street" role "street"
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="unclassified"/>
-#. color street
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="unsurfaced"/>
-#. color street
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>20000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="residential"/>
-#. color street
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="living_street"/>
-#. color street
-#: build/trans_presets.java:2111 build/trans_presets.java:3990
-#: build/trans_style.java:625 build/trans_style.java:641
-#: build/trans_style.java:657 build/trans_style.java:665
-msgid "street"
-msgstr "Gater"
-
-#: build/trans_presets.java:2111
-msgid "scheme"
-msgstr "Diagram"
-
-#. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2112
-msgid "Shown Area"
-msgstr "Synlig område"
-
-#: build/trans_presets.java:2112
-msgid "site"
-msgstr "Sted"
-
-#: build/trans_presets.java:2112
-msgid "city"
-msgstr "By"
-
-#: build/trans_presets.java:2112
-msgid "region"
-msgstr "Region"
-
-#. item "Tourism/Map" text "Closer Description"
-#. item "Tourism/Information Board" text "Closer Description"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2113 build/trans_presets.java:2129
-#: build/trans_presets.java:2177
-msgid "Closer Description"
-msgstr "Nærmere forklaring"
-
-#. <space />
-#. item "Tourism/Map" label "Routes shown for:"
-#. <space />
-#. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2115 build/trans_presets.java:2138
-msgid "Routes shown for:"
-msgstr "Ruter for:"
-
-#. item "Tourism/Map" check "Hiking"
-#. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2116 build/trans_presets.java:2139
-msgid "Hiking"
-msgstr "Tursti"
-
-#. item "Tourism/Map" check "Cycling"
-#. item "Tourism/Guidepost" check "Cycling"
-#. item "Sport/Cycling"
-#: build/trans_presets.java:2117 build/trans_presets.java:2140
-#: build/trans_presets.java:2362
-msgid "Cycling"
-msgstr "Sykling"
-
-#. item "Tourism/Map" check "Mountainbiking"
-#. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2118 build/trans_presets.java:2141
-msgid "Mountainbiking"
-msgstr "Fjellsykling"
-
-#. item "Tourism/Map" check "Skiing"
-#. item "Tourism/Guidepost" check "Skiing"
-#. item "Sport/Skiing"
-#: build/trans_presets.java:2119 build/trans_presets.java:2142
-#: build/trans_presets.java:2410
-msgid "Skiing"
-msgstr "Ski"
-
-#. item "Tourism/Map" check "Riding"
-#. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2120 build/trans_presets.java:2143
-msgid "Riding"
-msgstr "Riding"
-
-#. item "Tourism/Map" label "... other transportation modes possible"
-#. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2121 build/trans_presets.java:2144
-msgid "... other transportation modes possible"
-msgstr "… andre typer transport mulig"
-
-#. item "Tourism/Information Board"
-#: build/trans_presets.java:2123
-msgid "Information Board"
-msgstr "Informasjonstavle"
-
-#. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2128
-msgid "Board Content"
-msgstr "Tavleinnhold"
-
-#: build/trans_presets.java:2128
-msgid "notice"
-msgstr "Merknad"
-
-#: build/trans_presets.java:2128
-msgid "history"
-msgstr "Historisk"
-
-#: build/trans_presets.java:2128
-msgid "nature"
-msgstr "Natur"
-
-#: build/trans_presets.java:2128
-msgid "wildlife"
-msgstr "Dyreliv"
-
-#: build/trans_presets.java:2128
-msgid "plants"
-msgstr "Planter"
-
-#. item "Tourism/Guidepost"
-#: build/trans_presets.java:2131
-msgid "Guidepost"
-msgstr "Veiviser"
-
-#. item "Tourism/Flagpole"
-#: build/trans_presets.java:2146
-msgid "Flagpole"
-msgstr ""
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
-#. <key key="man_made" value="flagpole" />
-#. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2150
-msgid "Information Terminal"
-msgstr "Informasjonsterminal"
-
-#. item "Tourism/Information Terminal" text "Closer description"
-#. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2155 build/trans_presets.java:2165
-msgid "Closer description"
-msgstr "Nærmere beskrivelse"
-
-#. item "Tourism/Audioguide"
-#: build/trans_presets.java:2160
-msgid "Audioguide"
-msgstr "Lydomviser"
-
-#. <space />
-#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2170
-msgid "Audioguide via mobile phone?"
-msgstr "Lydomvisning via mobiltelefon"
-
-#. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2171
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2173
-msgid "Other Information Points"
-msgstr "Annen informasjon"
-
-#. group "Historic Places"
-#: build/trans_presets.java:2180
-msgid "Historic Places"
-msgstr "Historiske steder"
-
-#. item "Historic Places/Castle"
-#: build/trans_presets.java:2181
-msgid "Castle"
-msgstr "Slott"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:2184
-msgid "Edit Castle"
-msgstr "Rediger slott"
-
-#. item "Historic Places/Ruins"
+#. item "Leisure/Fishing"
 #: build/trans_presets.java:2189
-msgid "Ruins"
-msgstr "Ruiner"
-
-#. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:2190
-msgid "Edit Ruins"
-msgstr "Rediger ruiner"
-
-#. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:2195
-msgid "Archaeological Site"
-msgstr "Arkeologisk plass"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
-#. 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:2198
-msgid "Edit Archaeological Site"
-msgstr "Rediger arkeologisk plass"
-
-#. item "Historic Places/Battlefield"
-#: build/trans_presets.java:2203
-msgid "Battlefield"
-msgstr "Slagmark"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:2205
-msgid "Edit Battlefield"
-msgstr "Rediger slagmark"
-
-#. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:2209
-msgid "Palaeontological Site"
-msgstr "Paleontologisk sted"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:2211
-msgid "Edit Palaeontological Site"
-msgstr "Rediger paleontologisk sted"
-
-#. <separator/>
-#. item "Historic Places/Monument"
-#: build/trans_presets.java:2216
-msgid "Monument"
-msgstr "Monument"
-
-#. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:2217
-msgid "Edit Monument"
-msgstr "Rediger monument"
-
-#. item "Historic Places/Memorial"
-#: build/trans_presets.java:2221
-msgid "Memorial"
-msgstr "Minneplatte"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:2223
-msgid "Edit Memorial"
-msgstr "Rediger minneplatte"
-
-#. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2227
-msgid "Wayside Cross"
-msgstr "Kors i veikant"
-
-#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:2228
-msgid "Edit Wayside Cross"
-msgstr "Rediger kors i veikant"
-
-#. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2232
-msgid "Wayside Shrine"
-msgstr "Veialter"
-
-#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:2233
-msgid "Edit Wayside Shrine"
-msgstr "Rediger veialter"
-
-#. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2237
-msgid "Boundary Stone"
-msgstr "Grensestein"
-
-#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:2238
-msgid "Edit Boundary Stone"
-msgstr "Rediger grensestein"
-
-#. group "Leisure"
-#: build/trans_presets.java:2243
-msgid "Leisure"
-msgstr "Fritid"
-
-#. item "Leisure/Water Park"
-#: build/trans_presets.java:2244
-msgid "Water Park"
-msgstr "Badepark"
-
-#. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2245
-msgid "Edit Water Park"
-msgstr "Rediger badepark"
-
-#. item "Leisure/Playground"
-#: build/trans_presets.java:2249
-msgid "Playground"
-msgstr "Lekeplass"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2251
-msgid "Edit Playground"
-msgstr "Rediger lekeplass"
-
-#. item "Leisure/Fishing"
-#: build/trans_presets.java:2255
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2190
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
-#. item "Leisure/Sauna"
-#: build/trans_presets.java:2260
+#. group "Culture"
+#: build/trans_presets.java:2195
 #, fuzzy
-msgid "Sauna"
-msgstr "Kanal"
-
-#. item "Leisure/Sauna" label "Edit Sauna"
+msgid "Culture"
+msgstr "Møbler"
+
+#. item "Culture/Museum"
+#: build/trans_presets.java:2196
+msgid "Museum"
+msgstr "Museum"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#. item "Culture/Museum" label "Edit Museum"
+#: build/trans_presets.java:2198
+msgid "Edit Museum"
+msgstr "Rediger museum"
+
+#. item "Culture/Theatre"
+#: build/trans_presets.java:2204
+msgid "Theatre"
+msgstr "Teater"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
+#. item "Culture/Theatre" label "Edit Theatre"
+#: build/trans_presets.java:2207
+msgid "Edit Theatre"
+msgstr "Rediger teater"
+
+#. item "Culture/Library"
+#: build/trans_presets.java:2211
+msgid "Library"
+msgstr "Bibliotek"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
+#. item "Culture/Library" label "Edit Library"
+#: build/trans_presets.java:2214
+msgid "Edit Library"
+msgstr "Rediger bibliotek"
+
+#. item "Culture/Arts Centre"
+#: build/trans_presets.java:2219
+msgid "Arts Centre"
+msgstr "Kunstsenter"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
+#. item "Culture/Arts Centre" label "Edit Arts Centre"
+#: build/trans_presets.java:2221
+msgid "Edit Arts Centre"
+msgstr "Rediger kunstsenter"
+
+#. item "Culture/Artwork"
+#: build/trans_presets.java:2225
+msgid "Artwork"
+msgstr "Kunstverk"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#. item "Culture/Artwork" label "Edit Artwork"
+#: build/trans_presets.java:2227
+msgid "Edit Artwork"
+msgstr "Rediger kunstverk"
+
+#. item "Culture/Place of Worship"
+#: build/trans_presets.java:2231
+msgid "Place of Worship"
+msgstr "Tilbedelsessted"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+#. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
+#. item "Culture/Place of Worship" label "Edit Place of Worship"
+#: build/trans_presets.java:2235
+msgid "Edit Place of Worship"
+msgstr "Rediger tilbedelsessted"
+
+#. item "Culture/Place of Worship" combo "Religion"
+#. item "Land use/Graveyard" combo "Religion"
+#. item "Land use/Cemetery" combo "Religion"
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "Religion"
+msgstr "Religion"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "bahai"
+msgstr "bahai"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "buddhist"
+msgstr "buddhist"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "christian"
+msgstr "kristen"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "hindu"
+msgstr "hindu"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "jain"
+msgstr "jain"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "jewish"
+msgstr "jødisk"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "muslim"
+msgstr "muslim"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "sikh"
+msgstr "sikh"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "spiritualist"
+msgstr "spiritualist"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "taoist"
+msgstr "taoist"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "unitarian"
+msgstr "unitarisk"
+
+#: build/trans_presets.java:2238 build/trans_presets.java:3900
+#: build/trans_presets.java:3909
+msgid "zoroastrian"
+msgstr "zoroastrisk"
+
+#. item "Culture/Place of Worship" combo "Denomination"
+#. item "Land use/Graveyard" combo "Denomination"
+#. item "Land use/Cemetery" combo "Denomination"
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "Denomination"
+msgstr "Trosretniing"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "anglican"
+msgstr "anglikansk"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "baptist"
+msgstr "baptist"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "catholic"
+msgstr "katolsk"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "evangelical"
+msgstr "evangelisk"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "jehovahs_witness"
+msgstr "Jehovas vitner"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "lutheran"
+msgstr "luthersk"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "methodist"
+msgstr "metodist"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "mormon"
+msgstr "mormoner"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "orthodox"
+msgstr "ortodoks"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "pentecostal"
+msgstr "pinsebevegelsen"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "presbyterian"
+msgstr "presbyteriansk"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "protestant"
+msgstr "protestant"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "quaker"
+msgstr "quaker"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "shia"
+msgstr "shia"
+
+#: build/trans_presets.java:2239 build/trans_presets.java:3901
+#: build/trans_presets.java:3910
+msgid "sunni"
+msgstr "sunni"
+
+#. item "Culture/Recording Studio"
+#: build/trans_presets.java:2242
+msgid "Recording Studio"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
+#. item "Culture/Recording Studio" label "Edit Studio"
+#: build/trans_presets.java:2244
+#, fuzzy
+msgid "Edit Studio"
+msgstr "Rediger stadion"
+
+#: build/trans_presets.java:2249
+#, fuzzy
+msgid "audio"
+msgstr "Audio"
+
+#: build/trans_presets.java:2249
+#, fuzzy
+msgid "video"
+msgstr "Video"
+
+#. group "Public Building"
+#. item "Public Building/Public Building"
+#: build/trans_presets.java:2254 build/trans_presets.java:2255
+msgid "Public Building"
+msgstr "Offentlig bygning"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
+#. item "Public Building/Public Building" label "Edit Public Building"
+#: build/trans_presets.java:2257
+msgid "Edit Public Building"
+msgstr "Rediger offentlig bygning"
+
+#. item "Public Building/Town hall"
+#: build/trans_presets.java:2261
+msgid "Town hall"
+msgstr "Rådhus"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
+#. item "Public Building/Town hall" label "Edit Town hall"
+#: build/trans_presets.java:2263
+msgid "Edit Town hall"
+msgstr "Rediger rådhus"
+
+#. item "Public Building/Community Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
+#. item "Public Building/Community Centre" label "Community Centre"
+#: build/trans_presets.java:2267 build/trans_presets.java:2269
+#, fuzzy
+msgid "Community Centre"
+msgstr "Sportssenter"
+
+#. item "Public Building/Embassy"
+#: build/trans_presets.java:2276
+msgid "Embassy"
+msgstr "Ambassade"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
+#. item "Public Building/Embassy" label "Edit Embassy"
+#: build/trans_presets.java:2278
+msgid "Edit Embassy"
+msgstr "Rediger ambassade"
+
+#. item "Public Building/Courthouse"
+#: build/trans_presets.java:2282
+msgid "Courthouse"
+msgstr "Domstol"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
+#. item "Public Building/Courthouse" label "Edit Courthouse"
+#: build/trans_presets.java:2285
+msgid "Edit Courthouse"
+msgstr "Rediger domstol"
+
+#. item "Public Building/Prison"
+#: build/trans_presets.java:2289
+msgid "Prison"
+msgstr "Fengsel"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
+#. item "Public Building/Prison" label "Edit Prison"
+#: build/trans_presets.java:2292
+msgid "Edit Prison"
+msgstr "Rediger fengsel"
+
+#. item "Public Building/Police"
+#: build/trans_presets.java:2296
+msgid "Police"
+msgstr "Politi"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
+#. item "Public Building/Police" label "Edit Police"
+#: build/trans_presets.java:2300
+msgid "Edit Police"
+msgstr "Rediger politi"
+
+#. item "Public Building/Fire Station"
+#: build/trans_presets.java:2304
+msgid "Fire Station"
+msgstr "Brannstasjon"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
+#. item "Public Building/Fire Station" label "Edit Fire Station"
+#: build/trans_presets.java:2307
+msgid "Edit Fire Station"
+msgstr "Rediger brannstasjon"
+
+#. item "Public Building/Post Office"
+#: build/trans_presets.java:2311
+msgid "Post Office"
+msgstr "Postkontor"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
+#. item "Public Building/Post Office" label "Edit Post Office"
+#: build/trans_presets.java:2313
+msgid "Edit Post Office"
+msgstr "Rediger postkontor"
+
+#. group "Education"
+#: build/trans_presets.java:2319
+#, fuzzy
+msgid "Education"
+msgstr "Rediger kryss"
+
+#. item "Education/Kindergarten"
+#: build/trans_presets.java:2320
+msgid "Kindergarten"
+msgstr "Barnehage"
+
+#. item "Education/Kindergarten" label "Edit Kindergarten"
+#: build/trans_presets.java:2321
+msgid "Edit Kindergarten"
+msgstr "Rediger barnehage"
+
+#. item "Education/School"
+#: build/trans_presets.java:2325
+msgid "School"
+msgstr "Skole"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
+#. item "Education/School" label "Edit School"
+#: build/trans_presets.java:2327
+msgid "Edit School"
+msgstr "Rediger skole"
+
+#. item "Education/University"
+#: build/trans_presets.java:2331
+msgid "University"
+msgstr "Universitet"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
+#. item "Education/University" label "Edit University"
+#: build/trans_presets.java:2333
+msgid "Edit University"
+msgstr "Rediger universitet"
+
+#. item "Education/College"
+#: build/trans_presets.java:2337
+msgid "College"
+msgstr "Høyskole"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
+#. item "Education/College" label "Edit College"
+#: build/trans_presets.java:2339
+msgid "Edit College"
+msgstr "Rediger høyskole"
+
+#. item "Education/Driving School"
+#: build/trans_presets.java:2343
+#, fuzzy
+msgid "Driving School"
+msgstr "Rediger skole"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
+#. item "Education/Driving School" label "Edit Driving School"
+#: build/trans_presets.java:2345
+#, fuzzy
+msgid "Edit Driving School"
+msgstr "Rediger skole"
+
+#. item "Education/Driving School" text "License Classes"
+#: build/trans_presets.java:2350
+#, fuzzy
+msgid "License Classes"
+msgstr "Lisens"
+
+#. group "Health"
+#: build/trans_presets.java:2353
+msgid "Health"
+msgstr "Helse"
+
+#. item "Health/Doctors"
+#: build/trans_presets.java:2354
+msgid "Doctors"
+msgstr "Lege"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#. item "Health/Doctors" label "Edit Doctors"
+#: build/trans_presets.java:2356
+msgid "Edit Doctors"
+msgstr "Rediger lege"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:2361
+msgid "Dentist"
+msgstr "Tannlege"
+
+#. item "Health/Dentist" label "Edit Dentist"
+#: build/trans_presets.java:2362
+msgid "Edit Dentist"
+msgstr "Rediger tannlege"
+
+#. item "Health/Pharmacy"
+#: build/trans_presets.java:2367
+msgid "Pharmacy"
+msgstr "Apotek"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#: build/trans_presets.java:2369
+msgid "Edit Pharmacy"
+msgstr "Rediger apotek"
+
+#. <key key="amenity" value="pharmacy" />
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:2371
+msgid "Dispensing"
+msgstr "Reseptlevering"
+
+#. item "Health/Hearing Aids"
+#: build/trans_presets.java:2375
+#, fuzzy
+msgid "Hearing Aids"
+msgstr "Parkeringsvei"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
+#. item "Health/Hearing Aids" label "Edit Hearing Aids"
+#: build/trans_presets.java:2377
+#, fuzzy
+msgid "Edit Hearing Aids"
+msgstr "Rediger parkeringsvei"
+
+#. item "Health/Hospital"
+#: build/trans_presets.java:2384
+msgid "Hospital"
+msgstr "Sykehus"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#. item "Health/Hospital" label "Edit Hospital"
+#: build/trans_presets.java:2386
+msgid "Edit Hospital"
+msgstr "Rediger sykehus"
+
+#. item "Health/Baby Hatch"
+#: build/trans_presets.java:2390
+msgid "Baby Hatch"
+msgstr "Babyboks"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#: build/trans_presets.java:2392
+msgid "Edit Baby Hatch"
+msgstr "Rediger babyboks"
+
+#. item "Health/Emergency Access Point"
+#: build/trans_presets.java:2397
+msgid "Emergency Access Point"
+msgstr "Redningsmøtepunkt"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
+#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
+#: build/trans_presets.java:2400
+msgid "Edit Emergency Access Point"
+msgstr "Rediger redningsmøtepunkt"
+
 #. <space />
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
-#. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2261 build/trans_presets.java:2264
-#, fuzzy
-msgid "Edit Sauna"
-msgstr "Rediger kanal"
-
-#: build/trans_presets.java:2269 build/trans_presets.java:3038
-#: build/trans_presets.java:3047 build/trans_presets.java:3056
-#: build/trans_presets.java:3065 build/trans_presets.java:3113
-#: build/trans_presets.java:3122 build/trans_presets.java:3131
-#: build/trans_presets.java:3141 build/trans_presets.java:3150
-#: build/trans_presets.java:3166 build/trans_presets.java:3214
-#: build/trans_presets.java:3236 build/trans_presets.java:3245
-#: build/trans_presets.java:3288 build/trans_presets.java:3310
-#: build/trans_presets.java:3319 build/trans_presets.java:3328
-#: build/trans_presets.java:3343 build/trans_presets.java:3364
-#: build/trans_presets.java:3379
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
-#. item "Leisure/Sauna" combo "Zugang"
-#: build/trans_presets.java:2270
-msgid "Zugang"
-msgstr ""
-
+#. <key key="highway" value="emergency_access_point" />
+#. item "Health/Emergency Access Point" text "Point Number"
+#: build/trans_presets.java:2403
+msgid "Point Number"
+msgstr "Punktnummer"
+
+#. item "Health/Emergency Access Point" text "Point Name"
+#: build/trans_presets.java:2404
+msgid "Point Name"
+msgstr "Navn på punkt"
+
+#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
+#: build/trans_presets.java:2407
+msgid "(Use international code, like +12-345-67890)"
+msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
+
+#. <space />
+#. item "Health/Veterinary"
+#: build/trans_presets.java:2410
+msgid "Veterinary"
+msgstr "Veterinær"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
+#. item "Health/Veterinary" label "Edit Veterinary"
+#: build/trans_presets.java:2413
+msgid "Edit Veterinary"
+msgstr "Rediger veterinær"
+
+#. item "Facilities/Toilets"
+#: build/trans_presets.java:2420
+msgid "Toilets"
+msgstr "Toaletter"
+
+#: build/trans_presets.java:2427
+msgid "limited"
+msgstr "begrenset"
+
+#. item "Facilities/Toilets" text "Note"
+#. item "Vending machine" text "Note"
+#: build/trans_presets.java:2428 build/trans_presets.java:3577
+msgid "Note"
+msgstr "Kommentar"
+
+#. item "Facilities/Post Box"
+#: build/trans_presets.java:2430
+msgid "Post Box"
+msgstr "Postkasse"
+
+#. item "Facilities/Telephone"
+#: build/trans_presets.java:2435
+msgid "Telephone"
+msgstr "Telefon"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
+#. item "Facilities/Telephone" label "Edit Telephone"
+#: build/trans_presets.java:2438
+msgid "Edit Telephone"
+msgstr "Rediger telefon"
+
+#. item "Facilities/Telephone" check "Telephone cards"
+#: build/trans_presets.java:2446
+msgid "Telephone cards"
+msgstr "Telefonkort"
+
+#. item "Facilities/Clock"
+#: build/trans_presets.java:2448
+msgid "Clock"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
+#. item "Facilities/Clock" label "Edit Clock"
+#: build/trans_presets.java:2451
+msgid "Edit Clock"
+msgstr ""
+
+#. <key key="amenity" value="clock" />
+#. <optional>
+#. item "Facilities/Clock" combo "Display"
+#. item "Man Made/Man Made/Measurement Station" combo "Display"
+#: build/trans_presets.java:2454 build/trans_presets.java:3006
+msgid "Display"
+msgstr ""
+
+#: build/trans_presets.java:2454 build/trans_presets.java:3006
+msgid "analog"
+msgstr ""
+
+#: build/trans_presets.java:2454 build/trans_presets.java:3006
+msgid "digital"
+msgstr ""
+
+#: build/trans_presets.java:2454
+msgid "sundial"
+msgstr ""
+
+#: build/trans_presets.java:2454
+msgid "unorthodox"
+msgstr ""
+
+#. item "Facilities/Clock" combo "Support"
+#: build/trans_presets.java:2455
+msgid "Support"
+msgstr ""
+
+#: build/trans_presets.java:2455
+msgid "pole"
+msgstr ""
+
+#: build/trans_presets.java:2455
+msgid "wall_mounted"
+msgstr ""
+
+#: build/trans_presets.java:2455
+msgid "billboard"
+msgstr ""
+
+#. item "Facilities/Clock" combo "Visibility/readability"
+#: build/trans_presets.java:2456
+msgid "Visibility/readability"
+msgstr ""
+
+#: build/trans_presets.java:2456
+msgid "(up to 5m)"
+msgstr ""
+
+#: build/trans_presets.java:2456
+msgid "(up to 20m)"
+msgstr ""
+
+#: build/trans_presets.java:2456
+msgid "(more than 20m)"
+msgstr ""
+
+#. item "Facilities/Clock" check "Shows current date"
+#: build/trans_presets.java:2457
+msgid "Shows current date"
+msgstr ""
+
+#. item "Facilities/Clock" check "Shows temperature"
+#: build/trans_presets.java:2458
+msgid "Shows temperature"
+msgstr ""
+
+#. item "Facilities/Clock" check "Shows barometric pressure"
+#: build/trans_presets.java:2459
+msgid "Shows barometric pressure"
+msgstr ""
+
+#. item "Facilities/Clock" check "Shows humidity"
+#: build/trans_presets.java:2460
+msgid "Shows humidity"
+msgstr ""
+
+#. </optional>
+#. item "Facilities/Recycling"
+#: build/trans_presets.java:2463
+msgid "Recycling"
+msgstr "Returstasjon"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
+#. item "Facilities/Recycling" label "Edit Recycling station"
+#: build/trans_presets.java:2466
+msgid "Edit Recycling station"
+msgstr "Rediger returstasjon"
+
+#. <key key="amenity" value="recycling" />
+#. item "Facilities/Recycling" check "Batteries"
+#: build/trans_presets.java:2468
+msgid "Batteries"
+msgstr "Batterier"
+
+#. item "Facilities/Recycling" check "Cans"
+#: build/trans_presets.java:2469
+msgid "Cans"
+msgstr "Bokser"
+
+#. item "Facilities/Recycling" check "Glass"
+#: build/trans_presets.java:2471
+msgid "Glass"
+msgstr "Glass"
+
+#. item "Facilities/Recycling" check "Paper"
+#: build/trans_presets.java:2472
+msgid "Paper"
+msgstr "Papir"
+
+#. item "Facilities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2473
+msgid "Scrap Metal"
+msgstr "Metall"
+
+#. item "Facilities/Waste Basket"
+#: build/trans_presets.java:2475
+msgid "Waste Basket"
+msgstr "Søppeldunk"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#. item "Facilities/Waste Basket" label "Edit Waste Basket"
+#: build/trans_presets.java:2477
+msgid "Edit Waste Basket"
+msgstr "Rediger søppeldunk"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#. item "Facilities/Bench" combo "Backrest"
+#: build/trans_presets.java:2484
+msgid "Backrest"
+msgstr "Ryggstø"
+
+#. item "Facilities/Bench" combo "Material"
+#: build/trans_presets.java:2485
+msgid "Material"
+msgstr "Material"
+
+#: build/trans_presets.java:2485
+msgid "stone"
+msgstr "stein"
+
+#: build/trans_presets.java:2485
+msgid "plastic"
+msgstr "plast"
+
+#. item "Facilities/Bench" combo "Colour"
+#: build/trans_presets.java:2486
+msgid "Colour"
+msgstr "Farge"
+
+#: build/trans_presets.java:2486
+msgid "black"
+msgstr "svart"
+
+#: build/trans_presets.java:2486
+msgid "brown"
+msgstr "brun"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--landuse tags -->
+#.
+#. <rule>
+#. <condition k="landuse" v="farm"/>
+#. color green
+#. <icon annotate="true" src="misc/landmark/farm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmland"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="meadow"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
+#. color green
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="allotments"/>
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="greenhouse_horticulture"/>
+#. color green
+#. <icon src="misc/landuse/greenhouse_horticulture.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="grass"/>
+#. color green
+#. <icon src="rendering/landuse/cemetery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="village_green"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="recreation_ground"/>
+#. color green
+#: build/trans_presets.java:2486 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3708
+#: build/trans_style.java:3716
+msgid "green"
+msgstr "grønn"
+
+#: build/trans_presets.java:2486
+msgid "red"
+msgstr "rød"
+
+#: build/trans_presets.java:2486
+msgid "blue"
+msgstr "blå"
+
+#: build/trans_presets.java:2486
+msgid "gray"
+msgstr "grå"
+
+#: build/trans_presets.java:2486
+msgid "white"
+msgstr "hvit"
+
+#. item "Facilities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2487
+msgid "Amount of Seats"
+msgstr "Antall seter"
+
+#. item "Facilities/Shelter" label "Edit Shelter"
+#: build/trans_presets.java:2490
+msgid "Edit Shelter"
+msgstr "Rediger ly"
+
+#. item "Facilities/Hunting Stand"
+#: build/trans_presets.java:2495
+msgid "Hunting Stand"
+msgstr "Jaktpost"
+
+#. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
+#: build/trans_presets.java:2496
+msgid "Edit Hunting Stand"
+msgstr "Rediger jaktpost"
+
+#. <key key="amenity" value="hunting_stand" />
+#. item "Facilities/Hunting Stand" combo "Height"
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:2498 build/trans_presets.java:3761
+msgid "Height"
+msgstr "Høyde"
+
+#: build/trans_presets.java:2498
+msgid "low"
+msgstr "lav"
+
+#: build/trans_presets.java:2498
+msgid "half"
+msgstr "halv"
+
+#: build/trans_presets.java:2498
+msgid "full"
+msgstr "full"
+
+#. item "Facilities/Hunting Stand" combo "Hide"
+#: build/trans_presets.java:2500
+msgid "Hide"
+msgstr "Skjul"
+
+#. item "Facilities/Hunting Stand" combo "Lock"
+#: build/trans_presets.java:2501
+msgid "Lock"
+msgstr "Lås"
+
+#. <separator/>
+#. item "Facilities/Drinking Water"
+#: build/trans_presets.java:2504
+msgid "Drinking Water"
+msgstr "Drikkevann"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
+#. item "Facilities/Drinking Water" label "Edit Drinking Water"
+#: build/trans_presets.java:2507
+msgid "Edit Drinking Water"
+msgstr "Rediger drikkevann"
+
+#. item "Facilities/Fire Hydrant"
+#: build/trans_presets.java:2511
+msgid "Fire Hydrant"
+msgstr "Hydrant"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
+#. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
+#: build/trans_presets.java:2514
+msgid "Edit Fire Hydrant"
+msgstr "Rediger hydrant"
+
+#. <key key="amenity" value="fire_hydrant" />
 #. group "Sports"
-#. item "Shops/Sports"
-#: build/trans_presets.java:2274 build/trans_presets.java:3181
+#. item "Clothes/Sports"
+#: build/trans_presets.java:2519 build/trans_presets.java:3282
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2520
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2521
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2522
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -27625,6 +28912,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2281 build/trans_presets.java:2290
-#: build/trans_presets.java:2299 build/trans_presets.java:2308
+#: build/trans_presets.java:2526 build/trans_presets.java:2535
+#: build/trans_presets.java:2544 build/trans_presets.java:2553
 msgid "select sport:"
 msgstr "velg sport:"
@@ -27664,5 +28951,5 @@
 #. <condition k="sport" v="athletics"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/athletics.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27864,5 +29151,5 @@
 #. <condition k="sport" v="karting"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/karting.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27896,5 +29183,5 @@
 #. <condition k="sport" v="pelota"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/pelota.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27912,5 +29199,5 @@
 #. <condition k="sport" v="skating"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skating.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27992,5 +29279,5 @@
 #. <condition k="sport" v="beachvolleyball"/>
 #. color sport
-#. <icon annotate="true" src="sport/volleyball.png"/>
+#. <icon annotate="true" src="sport/beachvolleyball.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28062,15 +29349,7 @@
 #.
 #. <rule>
-#. <condition k="sport" v="karting"/>
-#. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="sport" v="safety_training"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/safety_training.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28080,5 +29359,5 @@
 #. <condition k="sport" v="model_aerodrome"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="transport/airport.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28088,279 +29367,279 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
-#: build/trans_style.java:4015 build/trans_style.java:4023
-#: build/trans_style.java:4031 build/trans_style.java:4039
-#: build/trans_style.java:4047 build/trans_style.java:4055
-#: build/trans_style.java:4063 build/trans_style.java:4071
-#: build/trans_style.java:4079 build/trans_style.java:4087
-#: build/trans_style.java:4095 build/trans_style.java:4103
-#: build/trans_style.java:4111 build/trans_style.java:4119
-#: build/trans_style.java:4127 build/trans_style.java:4135
-#: build/trans_style.java:4143 build/trans_style.java:4151
-#: build/trans_style.java:4159 build/trans_style.java:4167
-#: build/trans_style.java:4175 build/trans_style.java:4183
-#: build/trans_style.java:4191 build/trans_style.java:4199
-#: build/trans_style.java:4207 build/trans_style.java:4215
-#: build/trans_style.java:4223 build/trans_style.java:4231
-#: build/trans_style.java:4239 build/trans_style.java:4247
-#: build/trans_style.java:4255 build/trans_style.java:4263
-#: build/trans_style.java:4271 build/trans_style.java:4279
-#: build/trans_style.java:4287 build/trans_style.java:4295
-#: build/trans_style.java:4303 build/trans_style.java:4311
-#: build/trans_style.java:4319 build/trans_style.java:4327
-#: build/trans_style.java:4335 build/trans_style.java:4343
-#: build/trans_style.java:4351 build/trans_style.java:4359
-#: build/trans_style.java:4367 build/trans_style.java:4375
-#: build/trans_style.java:4383 build/trans_style.java:4391
-#: build/trans_style.java:4399 build/trans_style.java:4407
-#: build/trans_style.java:4415 build/trans_style.java:4423
-#: build/trans_style.java:4431 build/trans_style.java:4439
-#: build/trans_style.java:4447 build/trans_style.java:4455
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
+#: build/trans_style.java:4279 build/trans_style.java:4287
+#: build/trans_style.java:4295 build/trans_style.java:4303
+#: build/trans_style.java:4311 build/trans_style.java:4319
+#: build/trans_style.java:4327 build/trans_style.java:4335
+#: build/trans_style.java:4343 build/trans_style.java:4351
+#: build/trans_style.java:4359 build/trans_style.java:4367
+#: build/trans_style.java:4375 build/trans_style.java:4383
+#: build/trans_style.java:4391 build/trans_style.java:4399
+#: build/trans_style.java:4407 build/trans_style.java:4415
+#: build/trans_style.java:4423 build/trans_style.java:4431
+#: build/trans_style.java:4439 build/trans_style.java:4447
+#: build/trans_style.java:4455 build/trans_style.java:4463
+#: build/trans_style.java:4471 build/trans_style.java:4479
+#: build/trans_style.java:4487 build/trans_style.java:4495
+#: build/trans_style.java:4503
 msgid "sport"
 msgstr "sport"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:2283 build/trans_presets.java:2292
-#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_presets.java:2528 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
 msgid "tennis"
 msgstr "tennis"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2530
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2531
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2539
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2540
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2548
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2549
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2557
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2558
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2563
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2564
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
 #. group "Sport"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2570
 msgid "Sport"
 msgstr "Sport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2571
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2572
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -28408,244 +29687,247 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2330 build/trans_presets.java:2336
-#: build/trans_presets.java:2342 build/trans_presets.java:2348
-#: build/trans_presets.java:2354 build/trans_presets.java:2360
-#: build/trans_presets.java:2366 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2396
-#: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2417 build/trans_presets.java:2424
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2456 build/trans_presets.java:2462
-#: build/trans_presets.java:2468 build/trans_presets.java:2474
-#: build/trans_presets.java:2480 build/trans_presets.java:2486
-#: build/trans_presets.java:2492 build/trans_presets.java:2498
-#: build/trans_presets.java:2504 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2579 build/trans_presets.java:2585
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2587 build/trans_presets.java:2593
+#: build/trans_presets.java:2599 build/trans_presets.java:2605
+#: build/trans_presets.java:2611 build/trans_presets.java:2617
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2635 build/trans_presets.java:2641
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2662 build/trans_presets.java:2669
+#: build/trans_presets.java:2677 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2695
+#: build/trans_presets.java:2701 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2719
+#: build/trans_presets.java:2725 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2761
+#: build/trans_presets.java:2767 build/trans_presets.java:2773
+#: build/trans_presets.java:2779 build/trans_presets.java:2785
+#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817 build/trans_presets.java:2823
+#: build/trans_presets.java:2829 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
 msgid "type"
 msgstr "type"
 
-#: build/trans_presets.java:2330 build/trans_presets.java:2336
-#: build/trans_presets.java:2342 build/trans_presets.java:2348
-#: build/trans_presets.java:2354 build/trans_presets.java:2360
-#: build/trans_presets.java:2366 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2396
-#: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2417 build/trans_presets.java:2424
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2456 build/trans_presets.java:2462
-#: build/trans_presets.java:2468 build/trans_presets.java:2474
-#: build/trans_presets.java:2480 build/trans_presets.java:2486
-#: build/trans_presets.java:2492 build/trans_presets.java:2498
-#: build/trans_presets.java:2504 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2579 build/trans_presets.java:2585
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2587 build/trans_presets.java:2593
+#: build/trans_presets.java:2599 build/trans_presets.java:2605
+#: build/trans_presets.java:2611 build/trans_presets.java:2617
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2635 build/trans_presets.java:2641
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2662 build/trans_presets.java:2669
+#: build/trans_presets.java:2677 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2695
+#: build/trans_presets.java:2701 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2719
+#: build/trans_presets.java:2725 build/trans_presets.java:2734
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2761
+#: build/trans_presets.java:2767 build/trans_presets.java:2773
+#: build/trans_presets.java:2779 build/trans_presets.java:2785
+#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817 build/trans_presets.java:2823
+#: build/trans_presets.java:2829 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:2330 build/trans_presets.java:2336
-#: build/trans_presets.java:2342 build/trans_presets.java:2348
-#: build/trans_presets.java:2354 build/trans_presets.java:2360
-#: build/trans_presets.java:2366 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2396
-#: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2417 build/trans_presets.java:2424
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2456 build/trans_presets.java:2462
-#: build/trans_presets.java:2468 build/trans_presets.java:2474
-#: build/trans_presets.java:2480 build/trans_presets.java:2486
-#: build/trans_presets.java:2492 build/trans_presets.java:2498
-#: build/trans_presets.java:2504 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2579 build/trans_presets.java:2585
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2587 build/trans_presets.java:2593
+#: build/trans_presets.java:2599 build/trans_presets.java:2605
+#: build/trans_presets.java:2611 build/trans_presets.java:2617
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2635 build/trans_presets.java:2641
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2662 build/trans_presets.java:2669
+#: build/trans_presets.java:2677 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2695
+#: build/trans_presets.java:2701 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2719
+#: build/trans_presets.java:2725 build/trans_presets.java:2734
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2761
+#: build/trans_presets.java:2767 build/trans_presets.java:2773
+#: build/trans_presets.java:2779 build/trans_presets.java:2785
+#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817 build/trans_presets.java:2823
+#: build/trans_presets.java:2829 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
 msgid "sports_centre"
 msgstr "sportssenter"
 
-#: build/trans_presets.java:2330 build/trans_presets.java:2336
-#: build/trans_presets.java:2342 build/trans_presets.java:2348
-#: build/trans_presets.java:2354 build/trans_presets.java:2360
-#: build/trans_presets.java:2366 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2396
-#: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2417 build/trans_presets.java:2424
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2456 build/trans_presets.java:2462
-#: build/trans_presets.java:2468 build/trans_presets.java:2474
-#: build/trans_presets.java:2480 build/trans_presets.java:2486
-#: build/trans_presets.java:2492 build/trans_presets.java:2498
-#: build/trans_presets.java:2504 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2587 build/trans_presets.java:2593
+#: build/trans_presets.java:2599 build/trans_presets.java:2605
+#: build/trans_presets.java:2611 build/trans_presets.java:2617
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2635 build/trans_presets.java:2641
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2662 build/trans_presets.java:2669
+#: build/trans_presets.java:2677 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2695
+#: build/trans_presets.java:2701 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2719
+#: build/trans_presets.java:2725 build/trans_presets.java:2734
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2761
+#: build/trans_presets.java:2767 build/trans_presets.java:2773
+#: build/trans_presets.java:2779 build/trans_presets.java:2785
+#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:2330 build/trans_presets.java:2336
-#: build/trans_presets.java:2342 build/trans_presets.java:2348
-#: build/trans_presets.java:2354 build/trans_presets.java:2360
-#: build/trans_presets.java:2366 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2396
-#: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2417 build/trans_presets.java:2424
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2456 build/trans_presets.java:2462
-#: build/trans_presets.java:2468 build/trans_presets.java:2474
-#: build/trans_presets.java:2480 build/trans_presets.java:2486
-#: build/trans_presets.java:2492 build/trans_presets.java:2498
-#: build/trans_presets.java:2504 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2579 build/trans_presets.java:2585
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2587 build/trans_presets.java:2593
+#: build/trans_presets.java:2599 build/trans_presets.java:2605
+#: build/trans_presets.java:2611 build/trans_presets.java:2617
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2635 build/trans_presets.java:2641
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2662 build/trans_presets.java:2669
+#: build/trans_presets.java:2677 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2695
+#: build/trans_presets.java:2701 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2719
+#: build/trans_presets.java:2725 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2761
+#: build/trans_presets.java:2767 build/trans_presets.java:2773
+#: build/trans_presets.java:2779 build/trans_presets.java:2785
+#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817 build/trans_presets.java:2823
+#: build/trans_presets.java:2829 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
 msgid "track"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2577
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2578
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2583
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2584
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2589
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2590
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2595
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2596
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2601
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:2602
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2608
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2613
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2614
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2619
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2620
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2625
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2626
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2631
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2632
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2637
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2638
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2643
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2644
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2649
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2650
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -28653,52 +29935,52 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2657
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2660
 msgid "Piste type"
 msgstr "Løypetype"
 
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2660
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2660
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2660
 msgid "snow_park"
 msgstr "snøpark"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2661
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2661
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2661
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2661
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2661
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2661
 msgid "freeride"
 msgstr "fristil"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2664
 msgid "Shooting"
 msgstr "Skyting"
@@ -28706,214 +29988,239 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2666
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2672
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2673
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2674
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2679
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2680
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2685
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2686
 msgid "Edit American Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2691
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2692
 msgid "Edit Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2697
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2698
 msgid "Edit Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2703
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2704
 msgid "Edit Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2709
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2710
 msgid "Edit Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2715
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2716
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2721
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2722
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
+#. item "Sport (Ball)/Volleyball"
+#: build/trans_presets.java:2727
+msgid "Volleyball"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
+#. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "Edit Volleyball"
+msgstr "Rediger baseball"
+
+#. item "Sport (Ball)/Beachvolleyball"
+#: build/trans_presets.java:2736
+#, fuzzy
+msgid "Beachvolleyball"
+msgstr "Baseball"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
+#. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
+#: build/trans_presets.java:2738
+#, fuzzy
+msgid "Edit Beachvolleyball"
+msgstr "Rediger baseball"
+
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2745
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2746
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2749
 msgid "golf_course"
 msgstr "golfbane"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2751
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2752
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2757
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2758
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2763
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2764
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2769
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2770
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2775
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2776
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2781
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2782
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2787
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2788
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2793
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2794
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2799
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2800
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2805
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2806
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
@@ -28921,40 +30228,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2549 build/trans_presets.java:2550
+#: build/trans_presets.java:2812 build/trans_presets.java:2813
 msgid "Motorsport"
 msgstr ""
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2814
 msgid "Edit Motorsport"
 msgstr ""
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2819
 msgid "Karting"
 msgstr ""
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2820
 msgid "Edit Karting"
 msgstr ""
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2825
 msgid "Motocross"
 msgstr ""
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2826
 msgid "Edit Motocross"
 msgstr ""
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2831
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2832
 msgid "Edit Safety Training"
 msgstr ""
@@ -28962,479 +30269,86 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2838
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2839
 msgid "Edit Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2844
 msgid "RC Car"
 msgstr ""
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2845
 msgid "Edit RC Car"
 msgstr ""
 
-#. group "Man-Made"
-#: build/trans_presets.java:2589
-msgid "Man-Made"
+#. group "Man Made"
+#. group "Man Made/Man Made"
+#: build/trans_presets.java:2852 build/trans_presets.java:2853
+msgid "Man Made"
 msgstr "Menneskeskapt"
 
-#. item "Man-Made/Buildings/Building"
-#: build/trans_presets.java:2591
+#. item "Man Made/Man Made/Building"
+#: build/trans_presets.java:2854
 msgid "Building"
 msgstr "Bygning"
 
 #. <key key="building" value="yes" />
-#. item "Man-Made/Buildings/Public Building"
-#: build/trans_presets.java:2594
-msgid "Public Building"
-msgstr "Offentlig bygning"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2596
-msgid "Edit Public Building"
-msgstr "Rediger offentlig bygning"
-
-#. item "Man-Made/Buildings/Town hall"
-#: build/trans_presets.java:2600
-msgid "Town hall"
-msgstr "Rådhus"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2602
-msgid "Edit Town hall"
-msgstr "Rediger rådhus"
-
-#. item "Man-Made/Buildings/Embassy"
-#: build/trans_presets.java:2606
-msgid "Embassy"
-msgstr "Ambassade"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2608
-msgid "Edit Embassy"
-msgstr "Rediger ambassade"
-
-#. item "Man-Made/Buildings/Courthouse"
-#: build/trans_presets.java:2612
-msgid "Courthouse"
-msgstr "Domstol"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2615
-msgid "Edit Courthouse"
-msgstr "Rediger domstol"
-
-#. item "Man-Made/Buildings/Prison"
-#: build/trans_presets.java:2619
-msgid "Prison"
-msgstr "Fengsel"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#. item "Man-Made/Buildings/Prison" label "Edit Prison"
-#: build/trans_presets.java:2622
-msgid "Edit Prison"
-msgstr "Rediger fengsel"
-
-#. item "Man-Made/Buildings/Police"
-#: build/trans_presets.java:2626
-msgid "Police"
-msgstr "Politi"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#. item "Man-Made/Buildings/Police" label "Edit Police"
-#: build/trans_presets.java:2630
-msgid "Edit Police"
-msgstr "Rediger politi"
-
-#. item "Man-Made/Buildings/Fire Station"
-#: build/trans_presets.java:2634
-msgid "Fire Station"
-msgstr "Brannstasjon"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2637
-msgid "Edit Fire Station"
-msgstr "Rediger brannstasjon"
-
-#. item "Man-Made/Buildings/Post Office"
-#: build/trans_presets.java:2641
-msgid "Post Office"
-msgstr "Postkontor"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2643
-msgid "Edit Post Office"
-msgstr "Rediger postkontor"
-
-#. item "Man-Made/Buildings/Studio"
-#: build/trans_presets.java:2648
-#, fuzzy
-msgid "Studio"
-msgstr "Audio"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
-#. item "Man-Made/Buildings/Studio" label "Edit Studio"
-#: build/trans_presets.java:2650
-#, fuzzy
-msgid "Edit Studio"
-msgstr "Rediger stadion"
-
-#: build/trans_presets.java:2655
-#, fuzzy
-msgid "audio"
-msgstr "Audio"
-
-#: build/trans_presets.java:2655
-#, fuzzy
-msgid "video"
-msgstr "Video"
-
-#. item "Man-Made/Buildings/Studio" text "Phone"
-#: build/trans_presets.java:2656
-#, fuzzy
-msgid "Phone"
-msgstr "ingen"
-
+#. item "Man Made/Man Made/Tower"
+#: build/trans_presets.java:2857
+msgid "Tower"
+msgstr "Tårn"
+
+#. item "Man Made/Man Made/Tower" label "Edit Tower"
+#: build/trans_presets.java:2858
+msgid "Edit Tower"
+msgstr "Rediger tårn"
+
+#. item "Man Made/Man Made/Tower" combo "Tower type"
+#: build/trans_presets.java:2861
+msgid "Tower type"
+msgstr ""
+
+#: build/trans_presets.java:2861
+msgid "communication"
+msgstr ""
+
+#: build/trans_presets.java:2861
+msgid "observation"
+msgstr ""
+
+#. <optional>
+#. item "Man Made/Man Made/Tower" text "Height (meters)"
+#. item "Man Made/Man Made/Chimney" text "Height (meters)"
+#: build/trans_presets.java:2863 build/trans_presets.java:2884
+msgid "Height (meters)"
+msgstr "Høyde (meter)"
+
+#. </optional>
+#. item "Man Made/Man Made/Flagpole"
+#: build/trans_presets.java:2867
+msgid "Flagpole"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
 #. <separator/>
-#. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2660
-msgid "Kindergarten"
-msgstr "Barnehage"
-
-#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2661
-msgid "Edit Kindergarten"
-msgstr "Rediger barnehage"
-
-#. item "Man-Made/Buildings/School"
-#: build/trans_presets.java:2665
-msgid "School"
-msgstr "Skole"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#. item "Man-Made/Buildings/School" label "Edit School"
-#: build/trans_presets.java:2667
-msgid "Edit School"
-msgstr "Rediger skole"
-
-#. item "Man-Made/Buildings/University"
-#: build/trans_presets.java:2671
-msgid "University"
-msgstr "Universitet"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#. item "Man-Made/Buildings/University" label "Edit University"
-#: build/trans_presets.java:2673
-msgid "Edit University"
-msgstr "Rediger universitet"
-
-#. item "Man-Made/Buildings/College"
-#: build/trans_presets.java:2677
-msgid "College"
-msgstr "Høyskole"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#. item "Man-Made/Buildings/College" label "Edit College"
-#: build/trans_presets.java:2679
-msgid "Edit College"
-msgstr "Rediger høyskole"
-
-#. item "Man-Made/Buildings/Driving School"
-#: build/trans_presets.java:2683
-#, fuzzy
-msgid "Driving School"
-msgstr "Rediger skole"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
-#. item "Man-Made/Buildings/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2685
-#, fuzzy
-msgid "Edit Driving School"
-msgstr "Rediger skole"
-
-#. item "Man-Made/Buildings/Driving School" text "License Classes"
-#: build/trans_presets.java:2690
-#, fuzzy
-msgid "License Classes"
-msgstr "Lisens"
-
-#. <separator/>
-#. item "Man-Made/Buildings/Cinema"
-#: build/trans_presets.java:2693
-msgid "Cinema"
-msgstr "Kino"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2696
-msgid "Edit Cinema"
-msgstr "Rediger kino"
-
-#. item "Man-Made/Buildings/Library"
-#: build/trans_presets.java:2700
-msgid "Library"
-msgstr "Bibliotek"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#. item "Man-Made/Buildings/Library" label "Edit Library"
-#: build/trans_presets.java:2703
-msgid "Edit Library"
-msgstr "Rediger bibliotek"
-
-#. item "Man-Made/Buildings/Arts Centre"
-#: build/trans_presets.java:2708
-msgid "Arts Centre"
-msgstr "Kunstsenter"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2710
-msgid "Edit Arts Centre"
-msgstr "Rediger kunstsenter"
-
-#. item "Man-Made/Buildings/Theatre"
-#: build/trans_presets.java:2714
-msgid "Theatre"
-msgstr "Teater"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2717
-msgid "Edit Theatre"
-msgstr "Rediger teater"
-
-#. item "Man-Made/Buildings/Place of Worship"
-#: build/trans_presets.java:2721
-msgid "Place of Worship"
-msgstr "Tilbedelsessted"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
-#. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2725
-msgid "Edit Place of Worship"
-msgstr "Rediger tilbedelsessted"
-
-#. item "Man-Made/Buildings/Place of Worship" combo "Religion"
-#. item "Land use/Graveyard" combo "Religion"
-#. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "Religion"
-msgstr "Religion"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "bahai"
-msgstr "bahai"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "buddhist"
-msgstr "buddhist"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "christian"
-msgstr "kristen"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "hindu"
-msgstr "hindu"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "jain"
-msgstr "jain"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "jewish"
-msgstr "jødisk"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "muslim"
-msgstr "muslim"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "sikh"
-msgstr "sikh"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "spiritualist"
-msgstr "spiritualist"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "taoist"
-msgstr "taoist"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "unitarian"
-msgstr "unitarisk"
-
-#: build/trans_presets.java:2728 build/trans_presets.java:3786
-#: build/trans_presets.java:3795
-msgid "zoroastrian"
-msgstr "zoroastrisk"
-
-#. item "Man-Made/Buildings/Place of Worship" combo "Denomination"
-#. item "Land use/Graveyard" combo "Denomination"
-#. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "Denomination"
-msgstr "Trosretniing"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "anglican"
-msgstr "anglikansk"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "baptist"
-msgstr "baptist"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "catholic"
-msgstr "katolsk"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "evangelical"
-msgstr "evangelisk"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "jehovahs_witness"
-msgstr "Jehovas vitner"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "lutheran"
-msgstr "luthersk"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "methodist"
-msgstr "metodist"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "mormon"
-msgstr "mormoner"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "orthodox"
-msgstr "ortodoks"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "pentecostal"
-msgstr "pinsebevegelsen"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "presbyterian"
-msgstr "presbyteriansk"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "protestant"
-msgstr "protestant"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "quaker"
-msgstr "quaker"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "shia"
-msgstr "shia"
-
-#: build/trans_presets.java:2729 build/trans_presets.java:3787
-#: build/trans_presets.java:3796
-msgid "sunni"
-msgstr "sunni"
-
-#. group "Man Made"
-#: build/trans_presets.java:2733
-msgid "Man Made"
-msgstr "Menneskeskapt"
-
-#. item "Man Made/Works"
-#: build/trans_presets.java:2734
+#. item "Man Made/Man Made/Works"
+#: build/trans_presets.java:2872
 msgid "Works"
 msgstr "Fabrikk"
 
-#. item "Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:2735
+#. item "Man Made/Man Made/Works" label "Edit Works"
+#: build/trans_presets.java:2873
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
-#. item "Man Made/Tower"
-#: build/trans_presets.java:2739
-msgid "Tower"
-msgstr "Tårn"
-
-#. item "Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:2740
-msgid "Edit Tower"
-msgstr "Rediger tårn"
-
-#. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2743
-msgid "Tower type"
-msgstr ""
-
-#: build/trans_presets.java:2743
-msgid "communication"
-msgstr ""
-
-#: build/trans_presets.java:2743
-msgid "observation"
-msgstr ""
-
-#. <optional>
-#. item "Man Made/Tower" text "Height (meters)"
-#. item "Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:2745 build/trans_presets.java:2756
-msgid "Height (meters)"
-msgstr "Høyde (meter)"
-
-#. </optional>
-#. item "Man Made/Chimney"
-#: build/trans_presets.java:2749
+#. item "Man Made/Man Made/Chimney"
+#: build/trans_presets.java:2877
 #, fuzzy
 msgid "Chimney"
@@ -29442,54 +30356,285 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
-#. item "Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:2751
+#. item "Man Made/Man Made/Chimney" label "Edit Chimney"
+#: build/trans_presets.java:2879
 #, fuzzy
 msgid "Edit Chimney"
 msgstr "Rediger kino"
 
-#. item "Man Made/Water Tower"
-#: build/trans_presets.java:2758
+#. item "Man Made/Man Made/Windmill"
+#: build/trans_presets.java:2886
+msgid "Windmill"
+msgstr "Vindmølle"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
+#. item "Man Made/Man Made/Windmill" label "Edit Windmill"
+#: build/trans_presets.java:2888
+msgid "Edit Windmill"
+msgstr "Rediger vindmølle"
+
+#. item "Man Made/Man Made/Gasometer"
+#: build/trans_presets.java:2892
+msgid "Gasometer"
+msgstr "Gassbeholder"
+
+#. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
+#: build/trans_presets.java:2893
+msgid "Edit Gasometer"
+msgstr "Rediger gassbeholder"
+
+#. item "Man Made/Man Made/Pipeline"
+#: build/trans_presets.java:2897
+msgid "Pipeline"
+msgstr "Rørledning"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
+#. 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:2900
+msgid "Edit Pipeline"
+msgstr "Rediger rørledning"
+
+#: build/trans_presets.java:2903 build/trans_presets.java:3029
+msgid "gas"
+msgstr "gass"
+
+#: build/trans_presets.java:2903
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2903
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2903
+msgid "sewage"
+msgstr ""
+
+#. item "Man Made/Man Made/Pipeline" combo "Location"
+#: build/trans_presets.java:2904
+msgid "Location"
+msgstr "Område"
+
+#: build/trans_presets.java:2904
+#, fuzzy
+msgctxt "pipeline"
+msgid "underground"
+msgstr "P-kjeller"
+
+#: build/trans_presets.java:2904
+#, fuzzy
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "vann"
+
+#: build/trans_presets.java:2904
+#, fuzzy
+msgctxt "pipeline"
+msgid "overground"
+msgstr "P-kjeller"
+
+#. item "Man Made/Man Made/Crane"
+#: build/trans_presets.java:2906
+msgid "Crane"
+msgstr "Kran"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
+#. item "Man Made/Man Made/Crane" label "Edit Crane"
+#: build/trans_presets.java:2908
+msgid "Edit Crane"
+msgstr "Rediger kran"
+
+#. item "Man Made/Man Made/Mineshaft"
+#: build/trans_presets.java:2912
+msgid "Mineshaft"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft"
+#. 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:2915
+msgid "Edit Mineshaft"
+msgstr ""
+
+#. item "Man Made/Man Made/Mineshaft" combo "Function"
+#: build/trans_presets.java:2918
+#, fuzzy
+msgid "Function"
+msgstr "Kryss"
+
+#: build/trans_presets.java:2918
+#, fuzzy
+msgid "winding"
+msgstr "Sidespor"
+
+#: build/trans_presets.java:2918
+#, fuzzy
+msgid "air"
+msgstr "Bil"
+
+#. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
+#: build/trans_presets.java:2919
+msgid "Depth in meters"
+msgstr ""
+
+#. item "Man Made/Man Made/Mineshaft" combo "Resource"
+#. item "Man Made/Man Made/Adit" combo "Resource"
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "Resource"
+msgstr "Kilde"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "aggregate"
+msgstr "område"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+msgid "bauxite"
+msgstr ""
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#: build/trans_presets.java:3029
+msgid "coal"
+msgstr "kull"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "copper"
+msgstr "brygge"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "dimension_stone"
+msgstr "destinasjon"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "gold"
+msgstr "golf"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "ilmenite"
+msgstr "Fasiliteter"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+msgid "iron_ore"
+msgstr ""
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "lead"
+msgstr "land"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "limestone"
+msgstr "stein"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "nickel"
+msgstr "Avbryt"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "rutile"
+msgstr "Gjerdetrapp"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "salt"
+msgstr "målestokk"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "silver"
+msgstr "Elv"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "tin"
+msgstr "streng"
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+msgid "zinc"
+msgstr ""
+
+#: build/trans_presets.java:2921 build/trans_presets.java:2932
+#, fuzzy
+msgid "zircon"
+msgstr "Retning"
+
+#. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
+#: build/trans_presets.java:2922
+msgid "Visible Headframe"
+msgstr ""
+
+#. item "Man Made/Man Made/Mineshaft" check "Disused"
+#. item "Man Made/Man Made/Adit" check "Disused"
+#: build/trans_presets.java:2923 build/trans_presets.java:2933
+#, fuzzy
+msgid "Disused"
+msgstr "Nedlagt jernbane"
+
+#. item "Man Made/Man Made/Adit"
+#: build/trans_presets.java:2925
+#, fuzzy
+msgid "Adit"
+msgstr "Endre"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
+#. item "Man Made/Man Made/Adit" label "Edit Adit"
+#: build/trans_presets.java:2927
+#, fuzzy
+msgid "Edit Adit"
+msgstr "Rediger storby"
+
+#. item "Man Made/Man Made/Adit" text "Length in meters"
+#: build/trans_presets.java:2930
+#, fuzzy
+msgid "Length in meters"
+msgstr "Makslengde (meter)"
+
+#. <separator/>
+#. item "Man Made/Man Made/Water Tower"
+#: build/trans_presets.java:2936
 msgid "Water Tower"
 msgstr "Vanntårn"
 
-#. item "Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:2759
+#. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
+#: build/trans_presets.java:2937
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
-#. item "Man Made/Gasometer"
-#: build/trans_presets.java:2763
-msgid "Gasometer"
-msgstr "Gassbeholder"
-
-#. item "Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:2764
-msgid "Edit Gasometer"
-msgstr "Rediger gassbeholder"
-
-#. item "Man Made/Lighthouse"
-#: build/trans_presets.java:2768
-msgid "Lighthouse"
-msgstr "Fyrtårn"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#. item "Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:2770
-msgid "Edit Lighthouse"
-msgstr "Rediger fyrtårn"
-
-#. item "Man Made/Windmill"
-#: build/trans_presets.java:2774
-msgid "Windmill"
-msgstr "Vindmølle"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#. item "Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:2776
-msgid "Edit Windmill"
-msgstr "Rediger vindmølle"
-
-#. item "Man Made/Watermill"
-#: build/trans_presets.java:2780
+#. item "Man Made/Man Made/Water Works"
+#: build/trans_presets.java:2941
+#, fuzzy
+msgid "Water Works"
+msgstr "Badepark"
+
+#. <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:2943
+#, fuzzy
+msgid "Edit Water Works"
+msgstr "Rediger badepark"
+
+#. item "Man Made/Man Made/Wastewater Plant"
+#: build/trans_presets.java:2949
+msgid "Wastewater Plant"
+msgstr "Kloakkrenseanlegg"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
+#. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
+#: build/trans_presets.java:2953
+msgid "Edit Wastewater Plant"
+msgstr "Rediger kloakkrenseanlegg"
+
+#. item "Man Made/Man Made/Watermill"
+#: build/trans_presets.java:2957
 #, fuzzy
 msgid "Watermill"
@@ -29497,253 +30642,178 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
-#. item "Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:2782
+#. item "Man Made/Man Made/Watermill" label "Edit Watermill"
+#: build/trans_presets.java:2959
 #, fuzzy
 msgid "Edit Watermill"
 msgstr "Rediger foss"
 
-#. item "Man Made/Pipeline"
-#: build/trans_presets.java:2787
-msgid "Pipeline"
-msgstr "Rørledning"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#. item "Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:2790
-msgid "Edit Pipeline"
-msgstr "Rediger rørledning"
-
-#: build/trans_presets.java:2793 build/trans_presets.java:2849
-msgid "gas"
-msgstr "gass"
-
-#: build/trans_presets.java:2793
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2793
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2793
-msgid "sewage"
-msgstr ""
-
-#: build/trans_presets.java:2793
-msgid "any substance"
-msgstr ""
-
-#. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:2794
-msgid "Location"
-msgstr "Område"
-
-#: build/trans_presets.java:2794
-msgid "underwater"
-msgstr ""
-
-#: build/trans_presets.java:2794
-msgid "overground"
-msgstr ""
-
-#. item "Man Made/Wastewater Plant"
-#: build/trans_presets.java:2796
-msgid "Wastewater Plant"
-msgstr "Kloakkrenseanlegg"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:2800
-msgid "Edit Wastewater Plant"
-msgstr "Rediger kloakkrenseanlegg"
-
-#. item "Man Made/Crane"
-#: build/trans_presets.java:2804
-msgid "Crane"
-msgstr "Kran"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#. item "Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:2806
-msgid "Edit Crane"
-msgstr "Rediger kran"
-
-#. item "Man Made/Mineshaft"
-#: build/trans_presets.java:2810
-msgid "Mineshaft"
-msgstr ""
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
-#. item "Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:2813
-msgid "Edit Mineshaft"
-msgstr ""
-
-#. item "Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:2816
+#. item "Man Made/Man Made/Fountain"
+#: build/trans_presets.java:2964
+msgid "Fountain"
+msgstr "Fontene"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
+#. item "Man Made/Man Made/Fountain" label "Edit Fountain"
+#: build/trans_presets.java:2967
+msgid "Edit Fountain"
+msgstr "Rediger fontene"
+
+#. item "Man Made/Man Made/Water Well"
+#: build/trans_presets.java:2971
 #, fuzzy
-msgid "Function"
-msgstr "Kryss"
-
-#: build/trans_presets.java:2816
+msgid "Water Well"
+msgstr "Foss"
+
+#. <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:2973
 #, fuzzy
-msgid "winding"
-msgstr "Sidespor"
-
-#: build/trans_presets.java:2816
-#, fuzzy
-msgid "air"
-msgstr "Bil"
-
-#. item "Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:2817
-msgid "Depth in meters"
-msgstr ""
-
-#. item "Man Made/Mineshaft" combo "Resource"
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "Resource"
-msgstr "Kilde"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "aggregate"
-msgstr "område"
-
-#: build/trans_presets.java:2819
-msgid "bauxite"
-msgstr ""
-
-#: build/trans_presets.java:2819 build/trans_presets.java:2849
-msgid "coal"
-msgstr "kull"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "copper"
-msgstr "brygge"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "dimension_stone"
-msgstr "destinasjon"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "gold"
-msgstr "golf"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "ilmenite"
-msgstr "Fasiliteter"
-
-#: build/trans_presets.java:2819
-msgid "iron_ore"
-msgstr ""
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "lead"
-msgstr "land"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "limestone"
-msgstr "stein"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "nickel"
-msgstr "Avbryt"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "rutile"
-msgstr "Gjerdetrapp"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "salt"
-msgstr "målestokk"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "silver"
-msgstr "Elv"
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "tin"
-msgstr "streng"
-
-#: build/trans_presets.java:2819
-msgid "zinc"
-msgstr ""
-
-#: build/trans_presets.java:2819
-#, fuzzy
-msgid "zircon"
-msgstr "Retning"
-
-#. item "Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:2820
-#, fuzzy
-msgid "Visible Headframe"
-msgstr "Synlighetsstatus:"
-
-#. item "Man Made/Mineshaft" check "Mineshaft Disused"
-#: build/trans_presets.java:2821
-msgid "Mineshaft Disused"
-msgstr ""
+msgid "Edit Water Well"
+msgstr "Rediger foss"
+
+#. <separator/>
+#. item "Man Made/Man Made/Lighthouse"
+#: build/trans_presets.java:2978
+msgid "Lighthouse"
+msgstr "Fyrtårn"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
+#. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
+#: build/trans_presets.java:2980
+msgid "Edit Lighthouse"
+msgstr "Rediger fyrtårn"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#. item "Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:2825
+#. item "Man Made/Man Made/Beacon" label "Edit Beacon"
+#: build/trans_presets.java:2986
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
-#. item "Man Made/Survey Point"
-#: build/trans_presets.java:2829
+#. item "Man Made/Man Made/Street Lamp"
+#: build/trans_presets.java:2990
+#, fuzzy
+msgid "Street Lamp"
+msgstr "Gatenavn"
+
+#. <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:2992
+#, fuzzy
+msgid "Edit Street Lamp"
+msgstr "Rediger bekk"
+
+#. <space />
+#. <key key="highway" value="street_lamp" />
+#. item "Man Made/Man Made/Street Lamp" combo "Operation times"
+#: build/trans_presets.java:2995
+#, fuzzy
+msgid "Operation times"
+msgstr "Åpner filer"
+
+#: build/trans_presets.java:2995
+msgid "Mo-Fr 22:00-05:00"
+msgstr ""
+
+#. item "Man Made/Man Made/Measurement Station"
+#: build/trans_presets.java:2997
+#, fuzzy
+msgid "Measurement Station"
+msgstr "Mål"
+
+#. <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:2999
+#, fuzzy
+msgid "Edit Measurement Station"
+msgstr "Rediger brannstasjon"
+
+#. item "Man Made/Man Made/Measurement Station" combo "Measurement"
+#: build/trans_presets.java:3004
+#, fuzzy
+msgid "Measurement"
+msgstr "Mål"
+
+#: build/trans_presets.java:3004
+msgid "particulate_matter"
+msgstr ""
+
+#: build/trans_presets.java:3004
+msgid "seismic"
+msgstr ""
+
+#: build/trans_presets.java:3004
+#, fuzzy
+msgid "water_level"
+msgstr "vann"
+
+#: build/trans_presets.java:3004
+#, fuzzy
+msgid "weather"
+msgstr "vann"
+
+#. item "Man Made/Man Made/Measurement Station" combo "Recording"
+#: build/trans_presets.java:3005
+#, fuzzy
+msgid "Recording"
+msgstr "Riding"
+
+#: build/trans_presets.java:3005
+#, fuzzy
+msgid "manually"
+msgstr "Smug"
+
+#: build/trans_presets.java:3005
+#, fuzzy
+msgid "automated"
+msgstr "Last kartbilder automatisk"
+
+#: build/trans_presets.java:3005
+#, fuzzy
+msgid "remote"
+msgstr "rute"
+
+#. item "Man Made/Man Made/Survey Point"
+#: build/trans_presets.java:3008
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#. item "Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:2831
+#. item "Man Made/Man Made/Survey Point" label "Edit Survey Point"
+#: build/trans_presets.java:3010
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
-#. item "Man Made/Surveillance"
-#: build/trans_presets.java:2835
+#. item "Man Made/Man Made/Surveillance"
+#: build/trans_presets.java:3014
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#. item "Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:2837
+#. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
+#: build/trans_presets.java:3016
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
 
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3019
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3019
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3019
 msgid "public"
 msgstr ""
 
-#. <separator/>
-#. item "Man Made/Power Generator"
-#: build/trans_presets.java:2843
+#. group "Power"
+#: build/trans_presets.java:3022
+#, fuzzy
+msgid "Power"
+msgstr "Tårn"
+
+#. item "Power/Power Generator"
+#: build/trans_presets.java:3023
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -29752,31 +30822,31 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#. item "Man Made/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:2847
+#. item "Power/Power Generator" label "Edit Power Generator"
+#: build/trans_presets.java:3027
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:3029
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:3029
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:3029
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:3029
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:3029
 msgid "photovoltaic"
 msgstr "solcelle"
 
-#. item "Man Made/Power Station"
-#: build/trans_presets.java:2852
+#. item "Power/Power Station"
+#: build/trans_presets.java:3032
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -29784,11 +30854,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#. item "Man Made/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:2855
+#. item "Power/Power Station" label "Edit Power Station"
+#: build/trans_presets.java:3035
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
-#. item "Man Made/Power Sub Station"
-#: build/trans_presets.java:2861
+#. item "Power/Power Sub Station"
+#: build/trans_presets.java:3041
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -29796,17 +30866,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:2864
+#. item "Power/Power Sub Station" label "Edit Power Sub Station"
+#: build/trans_presets.java:3044
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
 
-#. item "Man Made/Power Sub Station" text "Line reference"
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2867 build/trans_presets.java:2884
+#. item "Power/Power Sub Station" text "Line reference"
+#. item "Power/Power Line" text "Line reference"
+#: build/trans_presets.java:3047 build/trans_presets.java:3080
 msgid "Line reference"
 msgstr "Linjenummer"
 
-#. item "Man Made/Power Tower"
-#: build/trans_presets.java:2869
+#. item "Power/Cable Distribution Cabinet"
+#: build/trans_presets.java:3049
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power%3Dcable_distribution_cabinet"
+#. 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:3052
+#, fuzzy
+msgid "Edit Cable Distribution Cabinet"
+msgstr "Rediger byggeplass"
+
+#. <separator/>
+#. item "Power/Power Tower"
+#: build/trans_presets.java:3058
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -29816,24 +30900,38 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#. item "Man Made/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:2874
+#. item "Power/Power Tower" label "Edit Power Tower"
+#: build/trans_presets.java:3063
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
 
-#: build/trans_presets.java:2875
-msgid "tower"
-msgstr ""
-
-#: build/trans_presets.java:2875 build/trans_presets.java:2927
-msgid "pole"
-msgstr ""
-
-#. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2876
+#. <key key="power" value="tower" />
+#. item "Power/Power Tower" text "Tower reference"
+#: build/trans_presets.java:3065
 msgid "Tower reference"
 msgstr ""
 
-#. item "Man Made/Power Line"
-#: build/trans_presets.java:2878
+#. item "Power/Pole"
+#: build/trans_presets.java:3067
+#, fuzzy
+msgid "Pole"
+msgstr "Politi"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power%3Dpole"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
+#. item "Power/Pole" label "Edit Power Pole"
+#: build/trans_presets.java:3070
+#, fuzzy
+msgid "Edit Power Pole"
+msgstr "Rediger kraftmast"
+
+#. <key key="power" value="tower" />
+#. item "Power/Pole" text "Pole reference"
+#: build/trans_presets.java:3072
+#, fuzzy
+msgid "Pole reference"
+msgstr "Innstillinger"
+
+#. item "Power/Power Line"
+#: build/trans_presets.java:3074
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -29841,477 +30939,254 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2881
+#. item "Power/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:3077
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
-#. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2882
+#. item "Power/Power Line" combo "Line type"
+#: build/trans_presets.java:3078
 msgid "Line type"
 msgstr ""
 
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:3078
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:3078
 msgctxt "Power Line"
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2887
+#. item "Power/Power Line" text "Amount of Cables"
+#: build/trans_presets.java:3083
 msgid "Amount of Cables"
 msgstr ""
 
-#. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2888
+#. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
+#: build/trans_presets.java:3084
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:3084
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:3084
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:3084
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:3084
 msgid "quad"
 msgstr ""
 
-#. group "Amenities"
-#: build/trans_presets.java:2891
-msgid "Amenities"
-msgstr "Fasiliteter"
-
-#. item "Amenities/Toilets"
-#: build/trans_presets.java:2892
-msgid "Toilets"
-msgstr "Toaletter"
-
-#: build/trans_presets.java:2899
-msgid "limited"
-msgstr "begrenset"
-
-#. item "Amenities/Toilets" text "Note"
-#. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2900 build/trans_presets.java:3389
-msgid "Note"
-msgstr "Kommentar"
-
-#. item "Amenities/Post Box"
-#: build/trans_presets.java:2902
-msgid "Post Box"
-msgstr "Postkasse"
-
-#. item "Amenities/Telephone"
-#: build/trans_presets.java:2907
-msgid "Telephone"
-msgstr "Telefon"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#. item "Amenities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2910
-msgid "Edit Telephone"
-msgstr "Rediger telefon"
-
-#. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2918
-msgid "Telephone cards"
-msgstr "Telefonkort"
-
-#. item "Amenities/Clock"
-#: build/trans_presets.java:2920
-msgid "Clock"
-msgstr ""
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
-#. item "Amenities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2923
-msgid "Edit Clock"
-msgstr ""
-
-#. <key key="amenity" value="clock" />
-#. <optional>
-#. item "Amenities/Clock" combo "Display"
-#: build/trans_presets.java:2926
-msgid "Display"
-msgstr ""
-
-#: build/trans_presets.java:2926
-msgid "analog"
-msgstr ""
-
-#: build/trans_presets.java:2926
-msgid "digital"
-msgstr ""
-
-#: build/trans_presets.java:2926
-msgid "sundial"
-msgstr ""
-
-#: build/trans_presets.java:2926
-msgid "unorthodox"
-msgstr ""
-
-#. item "Amenities/Clock" combo "Support"
-#: build/trans_presets.java:2927
-msgid "Support"
-msgstr ""
-
-#: build/trans_presets.java:2927
-msgid "wall_mounted"
-msgstr ""
-
-#: build/trans_presets.java:2927
-msgid "billboard"
-msgstr ""
-
-#. item "Amenities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2928
-msgid "Visibility/readability"
-msgstr ""
-
-#: build/trans_presets.java:2928
-msgid "(up to 5m)"
-msgstr ""
-
-#: build/trans_presets.java:2928
-msgid "(up to 20m)"
-msgstr ""
-
-#: build/trans_presets.java:2928
-msgid "(more than 20m)"
-msgstr ""
-
-#. item "Amenities/Clock" check "Shows current date"
-#: build/trans_presets.java:2929
-msgid "Shows current date"
-msgstr ""
-
-#. item "Amenities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2930
-msgid "Shows temperature"
-msgstr ""
-
-#. item "Amenities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2931
-msgid "Shows barometric pressure"
-msgstr ""
-
-#. item "Amenities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2932
-msgid "Shows humidity"
-msgstr ""
-
-#. </optional>
-#. item "Amenities/Recycling"
-#: build/trans_presets.java:2935
-msgid "Recycling"
-msgstr "Returstasjon"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#. item "Amenities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2938
-msgid "Edit Recycling station"
-msgstr "Rediger returstasjon"
-
-#. <key key="amenity" value="recycling" />
-#. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2940
-msgid "Batteries"
-msgstr "Batterier"
-
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2941
-msgid "Cans"
-msgstr "Bokser"
-
-#. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2943
-msgid "Glass"
-msgstr "Glass"
-
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2944
-msgid "Paper"
-msgstr "Papir"
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2945
-msgid "Scrap Metal"
-msgstr "Metall"
-
-#. item "Amenities/Waste Basket"
-#: build/trans_presets.java:2947
-msgid "Waste Basket"
-msgstr "Søppeldunk"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#. item "Amenities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2949
-msgid "Edit Waste Basket"
-msgstr "Rediger søppeldunk"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
-#. <key key="amenity" value="bench" />
-#. item "Amenities/Bench" combo "Backrest"
-#: build/trans_presets.java:2955
-msgid "Backrest"
-msgstr "Ryggstø"
-
-#. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2956
-msgid "Material"
-msgstr "Material"
-
-#: build/trans_presets.java:2956
-msgid "stone"
-msgstr "stein"
-
-#: build/trans_presets.java:2956
-msgid "plastic"
-msgstr "plast"
-
-#. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2957
-msgid "Colour"
-msgstr "Farge"
-
-#: build/trans_presets.java:2957
-msgid "black"
-msgstr "svart"
-
-#: build/trans_presets.java:2957
-msgid "brown"
-msgstr "brun"
-
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!--landuse tags -->
-#.
-#. <rule>
-#. <condition k="landuse" v="farm"/>
-#. color green
-#. <icon annotate="true" src="misc/landmark/farm.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="farmland"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="meadow"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="vineyard"/>
-#. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="orchard"/>
-#. color green
-#. <icon src="misc/landmark/trees.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="allotments"/>
-#. color green
-#. <icon src="misc/landmark/plant.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="grass"/>
-#. color green
-#. <icon src="rendering/landuse/cemetery.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="village_green"/>
-#. color green
-#. <icon src="leisure/common.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="recreation_ground"/>
-#. color green
-#: build/trans_presets.java:2957 build/trans_style.java:3467
-#: build/trans_style.java:3475 build/trans_style.java:3483
-#: build/trans_style.java:3491 build/trans_style.java:3499
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3652 build/trans_style.java:3660
-msgid "green"
-msgstr "grønn"
-
-#: build/trans_presets.java:2957
-msgid "red"
-msgstr "rød"
-
-#: build/trans_presets.java:2957
-msgid "blue"
-msgstr "blå"
-
-#: build/trans_presets.java:2957
-msgid "gray"
-msgstr "grå"
-
-#: build/trans_presets.java:2957
-msgid "white"
-msgstr "hvit"
-
-#. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2958
-msgid "Amount of Seats"
-msgstr "Antall seter"
-
-#. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2960
-msgid "Hunting Stand"
-msgstr "Jaktpost"
-
-#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2961
-msgid "Edit Hunting Stand"
-msgstr "Rediger jaktpost"
-
-#. <key key="amenity" value="hunting_stand" />
-#. item "Amenities/Hunting Stand" combo "Height"
-#. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2963 build/trans_presets.java:3655
-msgid "Height"
-msgstr "Høyde"
-
-#: build/trans_presets.java:2963
-msgid "low"
-msgstr "lav"
-
-#: build/trans_presets.java:2963
-msgid "half"
-msgstr "halv"
-
-#: build/trans_presets.java:2963
-msgid "full"
-msgstr "full"
-
-#. item "Amenities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2965
-msgid "Hide"
-msgstr "Skjul"
-
-#. item "Amenities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2966
-msgid "Lock"
-msgstr "Lås"
-
-#. item "Amenities/Fountain"
-#: build/trans_presets.java:2968
-msgid "Fountain"
-msgstr "Fontene"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#. item "Amenities/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:2971
-msgid "Edit Fountain"
-msgstr "Rediger fontene"
-
-#. item "Amenities/Drinking Water"
-#: build/trans_presets.java:2975
-msgid "Drinking Water"
-msgstr "Drikkevann"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#. item "Amenities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2978
-msgid "Edit Drinking Water"
-msgstr "Rediger drikkevann"
-
-#. item "Amenities/Fire Hydrant"
-#: build/trans_presets.java:2982
-msgid "Fire Hydrant"
-msgstr "Hydrant"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2985
-msgid "Edit Fire Hydrant"
-msgstr "Rediger hydrant"
-
-#. <key key="amenity" value="fire_hydrant" />
-#. group "Food"
-#: build/trans_presets.java:2989
+#. group "Historic Places"
+#: build/trans_presets.java:3087
+msgid "Historic Places"
+msgstr "Historiske steder"
+
+#. item "Historic Places/Castle"
+#: build/trans_presets.java:3088
+msgid "Castle"
+msgstr "Slott"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
+#. item "Historic Places/Castle" label "Edit Castle"
+#: build/trans_presets.java:3091
+msgid "Edit Castle"
+msgstr "Rediger slott"
+
+#. item "Historic Places/Ruins"
+#: build/trans_presets.java:3096
+msgid "Ruins"
+msgstr "Ruiner"
+
+#. item "Historic Places/Ruins" label "Edit Ruins"
+#: build/trans_presets.java:3097
+msgid "Edit Ruins"
+msgstr "Rediger ruiner"
+
+#. item "Historic Places/Archaeological Site"
+#: build/trans_presets.java:3102
+msgid "Archaeological Site"
+msgstr "Arkeologisk plass"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
+#. 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:3105
+msgid "Edit Archaeological Site"
+msgstr "Rediger arkeologisk plass"
+
+#. item "Historic Places/Battlefield"
+#: build/trans_presets.java:3110
+msgid "Battlefield"
+msgstr "Slagmark"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#: build/trans_presets.java:3112
+msgid "Edit Battlefield"
+msgstr "Rediger slagmark"
+
+#. item "Historic Places/Palaeontological Site"
+#: build/trans_presets.java:3116
+msgid "Palaeontological Site"
+msgstr "Paleontologisk sted"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
+#: build/trans_presets.java:3118
+msgid "Edit Palaeontological Site"
+msgstr "Rediger paleontologisk sted"
+
+#. <separator/>
+#. item "Historic Places/Monument"
+#: build/trans_presets.java:3123
+msgid "Monument"
+msgstr "Monument"
+
+#. item "Historic Places/Monument" label "Edit Monument"
+#: build/trans_presets.java:3124
+msgid "Edit Monument"
+msgstr "Rediger monument"
+
+#. item "Historic Places/Memorial"
+#: build/trans_presets.java:3128
+msgid "Memorial"
+msgstr "Minneplatte"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
+#. item "Historic Places/Memorial" label "Edit Memorial"
+#: build/trans_presets.java:3130
+msgid "Edit Memorial"
+msgstr "Rediger minneplatte"
+
+#. item "Historic Places/Wayside Cross"
+#: build/trans_presets.java:3134
+msgid "Wayside Cross"
+msgstr "Kors i veikant"
+
+#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
+#: build/trans_presets.java:3135
+msgid "Edit Wayside Cross"
+msgstr "Rediger kors i veikant"
+
+#. item "Historic Places/Wayside Shrine"
+#: build/trans_presets.java:3139
+msgid "Wayside Shrine"
+msgstr "Veialter"
+
+#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
+#: build/trans_presets.java:3140
+msgid "Edit Wayside Shrine"
+msgstr "Rediger veialter"
+
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:3144
+msgid "Boundary Stone"
+msgstr "Grensestein"
+
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#: build/trans_presets.java:3145
+msgid "Edit Boundary Stone"
+msgstr "Rediger grensestein"
+
+#. group "Shops"
+#: build/trans_presets.java:3151
+msgid "Shops"
+msgstr "Butikker"
+
+#. group "Shops/Food"
+#: build/trans_presets.java:3152
 msgid "Food"
 msgstr ""
 
-#. item "Food/Supermarket"
-#: build/trans_presets.java:2990
+#. item "Shops/Food/Supermarket"
+#: build/trans_presets.java:3153
 msgid "Supermarket"
 msgstr "Supermarked"
 
-#. item "Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:2991
+#. item "Shops/Food/Supermarket" label "Edit Supermarket"
+#: build/trans_presets.java:3154
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
-#. item "Food/Convenience Store"
-#: build/trans_presets.java:2996
+#. item "Shops/Food/Convenience Store"
+#: build/trans_presets.java:3159
 msgid "Convenience Store"
 msgstr "Minimarked"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#. item "Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:2998
+#. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
+#: build/trans_presets.java:3161
 msgid "Edit Convenience Store"
 msgstr "Rediger minimarked"
 
-#. item "Food/Kiosk"
-#: build/trans_presets.java:3003
+#. item "Shops/Food/Kiosk"
+#: build/trans_presets.java:3166
 msgid "Kiosk"
 msgstr "Kiosk"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#. item "Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3005
+#. item "Shops/Food/Kiosk" label "Edit Kiosk"
+#: build/trans_presets.java:3168
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
-#. item "Food/Confectionery"
-#: build/trans_presets.java:3010
+#. <separator/>
+#. item "Shops/Food/Baker"
+#: build/trans_presets.java:3174
+msgid "Baker"
+msgstr "Baker"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#. item "Shops/Food/Baker" label "Edit Baker"
+#: build/trans_presets.java:3176
+msgid "Edit Baker"
+msgstr "Rediger baker"
+
+#. item "Shops/Food/Butcher"
+#: build/trans_presets.java:3181
+msgid "Butcher"
+msgstr "Slakter"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#. item "Shops/Food/Butcher" label "Edit Butcher"
+#: build/trans_presets.java:3183
+msgid "Edit Butcher"
+msgstr "Rediger slakter"
+
+#. item "Shops/Food/Seafood"
+#: build/trans_presets.java:3188
+#, fuzzy
+msgid "Seafood"
+msgstr "mat"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
+#. item "Shops/Food/Seafood" label "Edit Seafood"
+#: build/trans_presets.java:3190
+#, fuzzy
+msgid "Edit Seafood"
+msgstr "Rediger skogsområde"
+
+#. item "Shops/Food/Deli (Fine Food)"
+#: build/trans_presets.java:3197
+msgid "Deli (Fine Food)"
+msgstr ""
+
+#. <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:3199
+msgid "Edit Deli (Fine Food)"
+msgstr ""
+
+#. item "Shops/Food/Confectionery"
+#: build/trans_presets.java:3206
 #, fuzzy
 msgid "Confectionery"
@@ -30319,58 +31194,13 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
-#. item "Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3012
+#. item "Shops/Food/Confectionery" label "Edit Confectionery"
+#: build/trans_presets.java:3208
 #, fuzzy
 msgid "Edit Confectionery"
 msgstr "Rediger kontinent"
 
-#. item "Food/Baker"
-#: build/trans_presets.java:3017
-msgid "Baker"
-msgstr "Baker"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#. item "Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3019
-msgid "Edit Baker"
-msgstr "Rediger baker"
-
-#. item "Food/Butcher"
-#: build/trans_presets.java:3024
-msgid "Butcher"
-msgstr "Slakter"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#. item "Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3026
-msgid "Edit Butcher"
-msgstr "Rediger slakter"
-
-#. item "Food/Seafood"
-#: build/trans_presets.java:3031
-#, fuzzy
-msgid "Seafood"
-msgstr "mat"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
-#. item "Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3033
-#, fuzzy
-msgid "Edit Seafood"
-msgstr "Rediger skogsområde"
-
-#. item "Food/Deli (Fine Food)"
-#: build/trans_presets.java:3040
-msgid "Deli (Fine Food)"
-msgstr ""
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
-#. item "Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
-#: build/trans_presets.java:3042
-msgid "Edit Deli (Fine Food)"
-msgstr ""
-
-#. item "Food/Marketplace"
-#: build/trans_presets.java:3049
+#. <separator/>
+#. item "Shops/Food/Marketplace"
+#: build/trans_presets.java:3214
 #, fuzzy
 msgid "Marketplace"
@@ -30378,115 +31208,324 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
-#. item "Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3051
+#. item "Shops/Food/Marketplace" label "Edit Marketplace"
+#: build/trans_presets.java:3216
 #, fuzzy
 msgid "Edit Marketplace"
 msgstr "Rediger marina"
 
-#. item "Food/Greengrocer"
-#: build/trans_presets.java:3058
+#. item "Shops/Food/Greengrocer"
+#: build/trans_presets.java:3223
 msgid "Greengrocer"
 msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
-#. item "Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3060
+#. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
+#: build/trans_presets.java:3225
 #, fuzzy
 msgid "Edit Greengrocer"
 msgstr "Rediger hagesenter"
 
-#. item "Food/Organic"
-#: build/trans_presets.java:3067
+#. item "Shops/Food/Organic"
+#: build/trans_presets.java:3232
 msgid "Organic"
 msgstr "Økologisk"
 
-#. item "Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3068
+#. item "Shops/Food/Organic" label "Edit Organic Shop"
+#: build/trans_presets.java:3233
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
 
-#. item "Food/Alcohol"
-#: build/trans_presets.java:3073
+#. <separator/>
+#. item "Shops/Food/Alcohol"
+#: build/trans_presets.java:3239
 msgid "Alcohol"
 msgstr "Sprit og vin"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#. item "Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3075
+#. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
+#: build/trans_presets.java:3241
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
-#. item "Food/Beverages"
-#: build/trans_presets.java:3080
+#. item "Shops/Food/Beverages"
+#: build/trans_presets.java:3246
 msgid "Beverages"
 msgstr "Drikke"
 
-#. item "Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3081
+#. item "Shops/Food/Beverages" label "Edit Beverages Shop"
+#: build/trans_presets.java:3247
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
-#. group "Shops"
-#: build/trans_presets.java:3087
-msgid "Shops"
-msgstr "Butikker"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:3088
+#. item "Clothes/Clothes" label "Edit Clothes Shop"
+#: build/trans_presets.java:3255
+msgid "Edit Clothes Shop"
+msgstr ""
+
+#. item "Clothes/Boutique"
+#: build/trans_presets.java:3260
+#, fuzzy
+msgid "Boutique"
+msgstr "Fortsett"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
+#. item "Clothes/Boutique" label "Edit Boutique"
+#: build/trans_presets.java:3262
+#, fuzzy
+msgid "Edit Boutique"
+msgstr "Rediger boule"
+
+#. item "Clothes/Shoes"
+#: build/trans_presets.java:3269
+msgid "Shoes"
+msgstr "Sko"
+
+#. item "Clothes/Shoes" label "Edit Shoe Shop"
+#: build/trans_presets.java:3270
+msgid "Edit Shoe Shop"
+msgstr "Rediger sko"
+
+#. item "Clothes/Outdoor"
+#: build/trans_presets.java:3275
+msgid "Outdoor"
+msgstr "Friluftsutstyr"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#. item "Clothes/Outdoor" label "Edit Outdoor Shop"
+#: build/trans_presets.java:3277
+msgid "Edit Outdoor Shop"
+msgstr "Rediger friluftsutstyr"
+
+#. item "Clothes/Sports" label "Edit Sports Shop"
+#: build/trans_presets.java:3283
+msgid "Edit Sports Shop"
+msgstr "Rediger sport"
+
+#. <separator/>
+#. item "Clothes/Dry Cleaning"
+#: build/trans_presets.java:3289
+msgid "Dry Cleaning"
+msgstr "Renseri"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
+#: build/trans_presets.java:3291
+msgid "Edit Dry Cleaning"
+msgstr "Rediger renseri"
+
+#. item "Clothes/Laundry"
+#: build/trans_presets.java:3296
+msgid "Laundry"
+msgstr "Vaskeri"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#. item "Clothes/Laundry" label "Edit Laundry"
+#: build/trans_presets.java:3298
+msgid "Edit Laundry"
+msgstr "Rediger vaskeri"
+
+#. item "Clothes/Tailor"
+#: build/trans_presets.java:3303
+msgid "Tailor"
+msgstr ""
+
+#. item "Clothes/Tailor" label "Edit Tailor"
+#: build/trans_presets.java:3304
+msgid "Edit Tailor"
+msgstr ""
+
+#. item "Clothes/Fabric"
+#: build/trans_presets.java:3309
+msgid "Fabric"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
+#. item "Clothes/Fabric" label "Edit Fabric"
+#: build/trans_presets.java:3311
+#, fuzzy
+msgid "Edit Fabric"
+msgstr "Rediger bar"
+
+#. group "Electronic"
+#: build/trans_presets.java:3319
+#, fuzzy
+msgid "Electronic"
+msgstr "Elektronikk"
+
+#. item "Electronic/Computer"
+#: build/trans_presets.java:3320
+msgid "Computer"
+msgstr "Dataelektronikk"
+
+#. item "Electronic/Computer" label "Edit Computer Shop"
+#: build/trans_presets.java:3321
+msgid "Edit Computer Shop"
+msgstr "Rediger dataelektronikk"
+
+#. item "Electronic/Electronics"
+#: build/trans_presets.java:3326
+msgid "Electronics"
+msgstr "Elektronikk"
+
+#. item "Electronic/Electronics" label "Edit Electronics Shop"
+#: build/trans_presets.java:3327
+msgid "Edit Electronics Shop"
+msgstr "Rediger elektronikk"
+
+#. item "Electronic/Mobile Phone"
+#: build/trans_presets.java:3332
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "brostein"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
+#. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
+#: build/trans_presets.java:3334
+#, fuzzy
+msgid "Edit Mobile Phone"
+msgstr "Rediger telefon"
+
+#. item "Electronic/Vacuum Cleaner"
+#: build/trans_presets.java:3341
+msgid "Vacuum Cleaner"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
+#. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
+#: build/trans_presets.java:3343
+#, fuzzy
+msgid "Edit Vacuum Cleaner"
+msgstr "Rediger kran"
+
+#. item "Electronic/Hifi"
+#: build/trans_presets.java:3350
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Electronic/Hifi" label "Edit Hifi Shop"
+#: build/trans_presets.java:3351
+msgid "Edit Hifi Shop"
+msgstr "Rediger hifi"
+
+#. item "Electronic/Video"
+#: build/trans_presets.java:3356
+msgid "Video"
+msgstr "Video"
+
+#. item "Electronic/Video" label "Edit Video Shop"
+#: build/trans_presets.java:3357
+msgid "Edit Video Shop"
+msgstr "Rediger video"
+
+#. group "Cash"
+#: build/trans_presets.java:3363
+msgid "Cash"
+msgstr "Valuta"
+
+#. item "Cash/Bank"
+#: build/trans_presets.java:3364
+msgid "Bank"
+msgstr "Bank"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#. item "Cash/Bank" label "Edit Bank"
+#: build/trans_presets.java:3366
+msgid "Edit Bank"
+msgstr "Rediger bank"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#. item "Cash/Automated Teller Machine"
+#: build/trans_presets.java:3371 build/trans_presets.java:3380
+msgid "Automated Teller Machine"
+msgstr "Minibank"
+
+#. item "Cash/Money Exchange"
+#: build/trans_presets.java:3373
+msgid "Money Exchange"
+msgstr "Vekslingssted"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#. item "Cash/Money Exchange" label "Edit Money Exchange"
+#: build/trans_presets.java:3375
+msgid "Edit Money Exchange"
+msgstr "Rediger vekslingssted"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
+#: build/trans_presets.java:3382
+msgid "Edit Automated Teller Machine"
+msgstr "Rediger minibank"
+
+#. item "Other/Department Store"
+#: build/trans_presets.java:3388
+#, fuzzy
+msgid "Department Store"
+msgstr "målemetode"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
+#. item "Other/Department Store" label "Edit Department Store"
+#: build/trans_presets.java:3390
+#, fuzzy
+msgid "Edit Department Store"
+msgstr "Rediger jernvarehandel"
+
+#. item "Other/Mall"
+#: build/trans_presets.java:3397
+#, fuzzy
+msgid "Mall"
+msgstr "alle"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
+#. item "Other/Mall" label "Edit Mall"
+#: build/trans_presets.java:3399
+#, fuzzy
+msgid "Edit Mall"
+msgstr "Rediger jernbane"
+
+#. <separator/>
+#. item "Other/Chemist"
+#: build/trans_presets.java:3407
 msgid "Chemist"
 msgstr "Hygiene"
 
-#. item "Shops/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3089
+#. item "Other/Chemist" label "Edit Chemist"
+#: build/trans_presets.java:3408
 msgid "Edit Chemist"
 msgstr "Rediger hygiene"
 
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:3094
+#. item "Other/Hairdresser"
+#: build/trans_presets.java:3413
 msgid "Hairdresser"
 msgstr "Frisør"
 
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3095
+#. item "Other/Hairdresser" label "Edit Hairdresser"
+#: build/trans_presets.java:3414
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
-#. item "Shops/Optician"
-#: build/trans_presets.java:3100
+#. item "Other/Optician"
+#: build/trans_presets.java:3419
 msgid "Optician"
 msgstr "Optiker"
 
-#. item "Shops/Optician" label "Edit Optician"
-#: build/trans_presets.java:3101
+#. item "Other/Optician" label "Edit Optician"
+#: build/trans_presets.java:3420
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
-#. item "Shops/Hearing Aids"
-#: build/trans_presets.java:3106
-#, fuzzy
-msgid "Hearing Aids"
-msgstr "Parkeringsvei"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
-#. item "Shops/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:3108
-#, fuzzy
-msgid "Edit Hearing Aids"
-msgstr "Rediger parkeringsvei"
-
-#. item "Shops/Jewelry"
-#: build/trans_presets.java:3115
+#. item "Other/Jewelry"
+#: build/trans_presets.java:3425
 msgid "Jewelry"
 msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
-#. item "Shops/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3117
+#. item "Other/Jewelry" label "Edit Jewelry"
+#: build/trans_presets.java:3427
 #, fuzzy
 msgid "Edit Jewelry"
 msgstr "Rediger fergerute"
 
-#. item "Shops/Erotic"
-#: build/trans_presets.java:3124
+#. item "Other/Erotic"
+#: build/trans_presets.java:3434
 #, fuzzy
 msgid "Erotic"
@@ -30494,6 +31533,6 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
-#. item "Shops/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3126
+#. item "Other/Erotic" label "Edit Erotic"
+#: build/trans_presets.java:3436
 #, fuzzy
 msgid "Edit Erotic"
@@ -30501,220 +31540,51 @@
 
 #. <separator/>
-#. item "Shops/Department Store"
-#: build/trans_presets.java:3134
-#, fuzzy
-msgid "Department Store"
-msgstr "målemetode"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
-#. item "Shops/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3136
-#, fuzzy
-msgid "Edit Department Store"
-msgstr "Rediger jernvarehandel"
-
-#. item "Shops/Mall"
-#: build/trans_presets.java:3143
-#, fuzzy
-msgid "Mall"
-msgstr "alle"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
-#. item "Shops/Mall" label "Edit Mall"
-#: build/trans_presets.java:3145
-#, fuzzy
-msgid "Edit Mall"
-msgstr "Rediger jernbane"
-
-#. item "Shops/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3154
-msgid "Edit Clothes Shop"
-msgstr ""
-
-#. item "Shops/Boutique"
-#: build/trans_presets.java:3159
-#, fuzzy
-msgid "Boutique"
-msgstr "Fortsett"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
-#. item "Shops/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3161
-#, fuzzy
-msgid "Edit Boutique"
-msgstr "Rediger boule"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:3168
-msgid "Shoes"
-msgstr "Sko"
-
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3169
-msgid "Edit Shoe Shop"
-msgstr "Rediger sko"
-
-#. item "Shops/Outdoor"
-#: build/trans_presets.java:3174
-msgid "Outdoor"
-msgstr "Friluftsutstyr"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3176
-msgid "Edit Outdoor Shop"
-msgstr "Rediger friluftsutstyr"
-
-#. item "Shops/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3182
-msgid "Edit Sports Shop"
-msgstr "Rediger sport"
-
-#. item "Shops/Dry Cleaning"
-#: build/trans_presets.java:3187
-msgid "Dry Cleaning"
-msgstr "Renseri"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3189
-msgid "Edit Dry Cleaning"
-msgstr "Rediger renseri"
-
-#. item "Shops/Laundry"
-#: build/trans_presets.java:3194
-msgid "Laundry"
-msgstr "Vaskeri"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3196
-msgid "Edit Laundry"
-msgstr "Rediger vaskeri"
-
-#. item "Shops/Tailor"
-#: build/trans_presets.java:3201
-msgid "Tailor"
-msgstr ""
-
-#. item "Shops/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3202
-msgid "Edit Tailor"
-msgstr ""
-
-#. item "Shops/Fabric"
-#: build/trans_presets.java:3207
-msgid "Fabric"
-msgstr ""
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
-#. item "Shops/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3209
-#, fuzzy
-msgid "Edit Fabric"
-msgstr "Rediger bar"
-
-#. <separator/>
-#. item "Shops/Computer"
-#: build/trans_presets.java:3217
-msgid "Computer"
-msgstr "Dataelektronikk"
-
-#. item "Shops/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3218
-msgid "Edit Computer Shop"
-msgstr "Rediger dataelektronikk"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:3223
-msgid "Electronics"
-msgstr "Elektronikk"
-
-#. item "Shops/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3224
-msgid "Edit Electronics Shop"
-msgstr "Rediger elektronikk"
-
-#. item "Shops/Mobile Phone"
-#: build/trans_presets.java:3229
-#, fuzzy
-msgid "Mobile Phone"
-msgstr "brostein"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
-#. item "Shops/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3231
-#, fuzzy
-msgid "Edit Mobile Phone"
-msgstr "Rediger telefon"
-
-#. item "Shops/Vacuum Cleaner"
-#: build/trans_presets.java:3238
-msgid "Vacuum Cleaner"
-msgstr ""
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
-#. item "Shops/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3240
-#, fuzzy
-msgid "Edit Vacuum Cleaner"
-msgstr "Rediger kran"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:3247
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3248
-msgid "Edit Hifi Shop"
-msgstr "Rediger hifi"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:3253
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3254
-msgid "Edit Video Shop"
-msgstr "Rediger video"
-
-#. <separator/>
-#. item "Shops/Florist"
-#: build/trans_presets.java:3260
+#. item "Other/Florist"
+#: build/trans_presets.java:3444
 msgid "Florist"
 msgstr "Blomster"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#. item "Shops/Florist" label "Edit Florist"
-#: build/trans_presets.java:3262
+#. item "Other/Florist" label "Edit Florist"
+#: build/trans_presets.java:3446
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
-#. item "Shops/Garden Centre"
-#: build/trans_presets.java:3267
+#. item "Other/Garden Centre"
+#: build/trans_presets.java:3451
 msgid "Garden Centre"
 msgstr "Hagesenter"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#. item "Shops/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3269
+#. item "Other/Garden Centre" label "Edit Garden Centre"
+#: build/trans_presets.java:3453
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
 
-#. item "Shops/Hardware"
-#: build/trans_presets.java:3274
+#. <separator/>
+#. item "Other/Do-it-yourself-store"
+#: build/trans_presets.java:3459
+msgid "Do-it-yourself-store"
+msgstr "Byggevare"
+
+#. <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:3461
+msgid "Edit Do-it-yourself-store"
+msgstr "Rediger byggevare"
+
+#. item "Other/Hardware"
+#: build/trans_presets.java:3466
 msgid "Hardware"
 msgstr "Jernvarehandel"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#. item "Shops/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3276
+#. item "Other/Hardware" label "Edit Hardware Store"
+#: build/trans_presets.java:3468
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
-#. item "Shops/Paint"
-#: build/trans_presets.java:3281
+#. item "Other/Paint"
+#: build/trans_presets.java:3473
 #, fuzzy
 msgid "Paint"
@@ -30722,33 +31592,23 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
-#. item "Shops/Paint" label "Edit Paint"
-#: build/trans_presets.java:3283
+#. item "Other/Paint" label "Edit Paint"
+#: build/trans_presets.java:3475
 #, fuzzy
 msgid "Edit Paint"
 msgstr "Rediger sti"
 
-#. item "Shops/Do-it-yourself-store"
-#: build/trans_presets.java:3290
-msgid "Do-it-yourself-store"
-msgstr "Byggevare"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3292
-msgid "Edit Do-it-yourself-store"
-msgstr "Rediger byggevare"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:3297
+#. <separator/>
+#. item "Other/Furniture"
+#: build/trans_presets.java:3483
 msgid "Furniture"
 msgstr "Møbler"
 
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3298
+#. item "Other/Furniture" label "Edit Furniture Shop"
+#: build/trans_presets.java:3484
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
-#. item "Shops/Kitchen"
-#: build/trans_presets.java:3303
+#. item "Other/Kitchen"
+#: build/trans_presets.java:3489
 #, fuzzy
 msgid "Kitchen"
@@ -30756,12 +31616,12 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
-#. item "Shops/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3305
+#. item "Other/Kitchen" label "Edit Kitchen"
+#: build/trans_presets.java:3491
 #, fuzzy
 msgid "Edit Kitchen"
 msgstr "Rediger dike"
 
-#. item "Shops/Curtain"
-#: build/trans_presets.java:3312
+#. item "Other/Curtain"
+#: build/trans_presets.java:3498
 #, fuzzy
 msgid "Curtain"
@@ -30769,12 +31629,12 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
-#. item "Shops/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3314
+#. item "Other/Curtain" label "Edit Curtain"
+#: build/trans_presets.java:3500
 #, fuzzy
 msgid "Edit Curtain"
 msgstr "Rediger drenering"
 
-#. item "Shops/Frame"
-#: build/trans_presets.java:3321
+#. item "Other/Frame"
+#: build/trans_presets.java:3507
 #, fuzzy
 msgid "Frame"
@@ -30782,22 +31642,23 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
-#. item "Shops/Frame" label "Edit Frames"
-#: build/trans_presets.java:3323
+#. item "Other/Frame" label "Edit Frames"
+#: build/trans_presets.java:3509
 #, fuzzy
 msgid "Edit Frames"
 msgstr "Rediger trikk"
 
-#. item "Shops/Stationery"
-#: build/trans_presets.java:3330
+#. <separator/>
+#. item "Other/Stationery"
+#: build/trans_presets.java:3517
 msgid "Stationery"
 msgstr "Kontor"
 
-#. item "Shops/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3331
+#. item "Other/Stationery" label "Edit Stationery Shop"
+#: build/trans_presets.java:3518
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
-#. item "Shops/Copyshop"
-#: build/trans_presets.java:3336
+#. item "Other/Copyshop"
+#: build/trans_presets.java:3523
 #, fuzzy
 msgid "Copyshop"
@@ -30805,416 +31666,270 @@
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
-#. item "Shops/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3338
+#. item "Other/Copyshop" label "Edit Copyshop"
+#: build/trans_presets.java:3525
 #, fuzzy
 msgid "Edit Copyshop"
 msgstr "Rediger leker"
 
-#. item "Shops/Book Store"
-#: build/trans_presets.java:3345
+#. item "Other/Book Store"
+#: build/trans_presets.java:3532
 msgid "Book Store"
 msgstr "Bokhandel"
 
-#. item "Shops/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3346
+#. item "Other/Book Store" label "Edit Book Store"
+#: build/trans_presets.java:3533
 msgid "Edit Book Store"
 msgstr "Rediger bokhandel"
 
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:3351
+#. <separator/>
+#. item "Other/Travel Agency"
+#: build/trans_presets.java:3539
 msgid "Travel Agency"
 msgstr "Reisebyrå"
 
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3352
+#. item "Other/Travel Agency" label "Edit Travel Agency"
+#: build/trans_presets.java:3540
 msgid "Edit Travel Agency"
 msgstr "Rediger reisebyrå"
 
-#. item "Shops/Musical Instrument"
-#: build/trans_presets.java:3357
+#. item "Other/Musical Instrument"
+#: build/trans_presets.java:3545
 msgid "Musical Instrument"
 msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
-#. item "Shops/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3359
+#. item "Other/Musical Instrument" label "Edit Musical Instruments"
+#: build/trans_presets.java:3547
 #, fuzzy
 msgid "Edit Musical Instruments"
 msgstr "Rediger monument"
 
-#. item "Shops/Toys"
-#: build/trans_presets.java:3366
+#. item "Other/Toys"
+#: build/trans_presets.java:3554
 msgid "Toys"
 msgstr "Leker"
 
-#. item "Shops/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3367
+#. item "Other/Toys" label "Edit Toy Shop"
+#: build/trans_presets.java:3555
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
-#. item "Shops/Variety Store"
-#: build/trans_presets.java:3372
+#. item "Other/Variety Store"
+#: build/trans_presets.java:3560
 msgid "Variety Store"
 msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
-#. item "Shops/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3374
+#. item "Other/Variety Store" label "Edit Variety Store"
+#: build/trans_presets.java:3562
 #, fuzzy
 msgid "Edit Variety Store"
 msgstr "Rediger jernvarehandel"
 
-#. <separator/>
-#. item "Shops/Vending machine"
-#: build/trans_presets.java:3382
+#. item "Vending machine"
+#: build/trans_presets.java:3570
 msgid "Vending machine"
 msgstr "Automat"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3384
+#. item "Vending machine" label "Edit Vending machine"
+#: build/trans_presets.java:3572
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
 
 #. <key key="amenity" value="vending_machine" />
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:3386
+#. item "Vending machine" combo "Vending products"
+#: build/trans_presets.java:3574
 msgid "Vending products"
 msgstr "Automatprodukter"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "photos"
 msgstr "fotografier"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "stamps"
 msgstr "frimerker"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "vouchers"
 msgstr "kuponger"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "bicycle_tube"
 msgstr "sykkelslanger"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3574
 msgid "excrement_bags"
 msgstr "hundeposer"
 
-#. group "Cash"
-#: build/trans_presets.java:3398
-msgid "Cash"
-msgstr "Valuta"
-
-#. item "Cash/Bank"
-#: build/trans_presets.java:3399
-msgid "Bank"
-msgstr "Bank"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3401
-msgid "Edit Bank"
-msgstr "Rediger bank"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3406 build/trans_presets.java:3415
-msgid "Automated Teller Machine"
-msgstr "Minibank"
-
-#. item "Cash/Money Exchange"
-#: build/trans_presets.java:3408
-msgid "Money Exchange"
-msgstr "Vekslingssted"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3410
-msgid "Edit Money Exchange"
-msgstr "Rediger vekslingssted"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3417
-msgid "Edit Automated Teller Machine"
-msgstr "Rediger minibank"
-
-#. group "Health"
-#: build/trans_presets.java:3422
-msgid "Health"
-msgstr "Helse"
-
-#. item "Health/Doctors"
-#: build/trans_presets.java:3423
-msgid "Doctors"
-msgstr "Lege"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:3425
-msgid "Edit Doctors"
-msgstr "Rediger lege"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:3430
-msgid "Dentist"
-msgstr "Tannlege"
-
-#. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:3431
-msgid "Edit Dentist"
-msgstr "Rediger tannlege"
-
-#. item "Health/Pharmacy"
-#: build/trans_presets.java:3436
-msgid "Pharmacy"
-msgstr "Apotek"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:3438
-msgid "Edit Pharmacy"
-msgstr "Rediger apotek"
-
-#. <key key="amenity" value="pharmacy" />
-#. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:3440
-msgid "Dispensing"
-msgstr "Reseptlevering"
-
-#. item "Health/Hospital"
-#: build/trans_presets.java:3444
-msgid "Hospital"
-msgstr "Sykehus"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:3446
-msgid "Edit Hospital"
-msgstr "Rediger sykehus"
-
-#. item "Health/Baby Hatch"
-#: build/trans_presets.java:3450
-msgid "Baby Hatch"
-msgstr "Babyboks"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:3452
-msgid "Edit Baby Hatch"
-msgstr "Rediger babyboks"
-
-#. item "Health/Emergency Access Point"
-#: build/trans_presets.java:3457
-msgid "Emergency Access Point"
-msgstr "Redningsmøtepunkt"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
-#: build/trans_presets.java:3460
-msgid "Edit Emergency Access Point"
-msgstr "Rediger redningsmøtepunkt"
-
-#. <space />
-#. <key key="highway" value="emergency_access_point" />
-#. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3463
-msgid "Point Number"
-msgstr "Punktnummer"
-
-#. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:3464
-msgid "Point Name"
-msgstr "Navn på punkt"
-
-#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:3467
-msgid "(Use international code, like +12-345-67890)"
-msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
-
-#. <space />
-#. item "Health/Veterinary"
-#: build/trans_presets.java:3470
-msgid "Veterinary"
-msgstr "Veterinær"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:3473
-msgid "Edit Veterinary"
-msgstr "Rediger veterinær"
-
 #. group "Geography"
-#: build/trans_presets.java:3480 build/trans_presets.java:3597
+#: build/trans_presets.java:3586 build/trans_presets.java:3703
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3481
+#: build/trans_presets.java:3587
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3482
+#: build/trans_presets.java:3588
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3483
+#: build/trans_presets.java:3589
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3488
+#: build/trans_presets.java:3594
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3489
+#: build/trans_presets.java:3595
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3494
+#: build/trans_presets.java:3600
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3495
+#: build/trans_presets.java:3601
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3500
+#: build/trans_presets.java:3606
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3501
+#: build/trans_presets.java:3607
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3506
+#: build/trans_presets.java:3612
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3507
+#: build/trans_presets.java:3613
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. group "Places"
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:3619
 msgid "Places"
 msgstr "Steder"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3514
+#: build/trans_presets.java:3620
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3621
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3521
+#: build/trans_presets.java:3627
 msgid "Country"
 msgstr "Land"
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3522
+#: build/trans_presets.java:3628
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Places/State"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3634
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3529
+#: build/trans_presets.java:3635
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3535
+#: build/trans_presets.java:3641
 msgid "Region"
 msgstr "Region"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3536
+#: build/trans_presets.java:3642
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Places/County"
-#: build/trans_presets.java:3542
+#: build/trans_presets.java:3648
 msgid "County"
 msgstr "Kommune"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3543
+#: build/trans_presets.java:3649
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -31222,15 +31937,15 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3550
+#: build/trans_presets.java:3656
 msgid "City"
 msgstr "Storby"
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3657
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3557
+#: build/trans_presets.java:3663
 msgid "Town"
 msgstr "By"
@@ -31238,10 +31953,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3559
+#: build/trans_presets.java:3665
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3565
+#: build/trans_presets.java:3671
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -31249,25 +31964,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3567
+#: build/trans_presets.java:3673
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3573
+#: build/trans_presets.java:3679
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3574
+#: build/trans_presets.java:3680
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3580
+#: build/trans_presets.java:3686
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3687
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -31275,5 +31990,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:3694
 msgid "Locality"
 msgstr "Lokalitet"
@@ -31281,10 +31996,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3590
+#: build/trans_presets.java:3696
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3598
+#: build/trans_presets.java:3704
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -31292,10 +32007,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3600
+#: build/trans_presets.java:3706
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3606
+#: build/trans_presets.java:3712
 msgid "Glacier"
 msgstr "Isbre"
@@ -31303,10 +32018,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3714
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3614
+#: build/trans_presets.java:3720
 msgid "Volcano"
 msgstr "Vulkan"
@@ -31314,10 +32029,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3616
+#: build/trans_presets.java:3722
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3622
+#: build/trans_presets.java:3728
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -31325,5 +32040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3624
+#: build/trans_presets.java:3730
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
@@ -31331,5 +32046,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3630
+#: build/trans_presets.java:3736
 msgid "Island"
 msgstr "Øy"
@@ -31337,10 +32052,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3632
+#: build/trans_presets.java:3738
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:3744
 msgid "Islet"
 msgstr "Holme"
@@ -31348,15 +32063,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3640
+#: build/trans_presets.java:3746
 msgid "Edit Islet"
 msgstr "Rediger holme"
 
 #. group "Nature"
-#: build/trans_presets.java:3647
+#: build/trans_presets.java:3753
 msgid "Nature"
 msgstr ""
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3648
+#: build/trans_presets.java:3754
 msgid "Tree"
 msgstr "Tre"
@@ -31365,15 +32080,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3651
+#: build/trans_presets.java:3757
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3656
+#: build/trans_presets.java:3762
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3764
 msgid "Wood"
 msgstr "Skogsområde"
@@ -31382,22 +32097,22 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:3661
+#: build/trans_presets.java:3767
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
 
-#: build/trans_presets.java:3664 build/trans_presets.java:3673
+#: build/trans_presets.java:3770 build/trans_presets.java:3779
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:3664 build/trans_presets.java:3673
+#: build/trans_presets.java:3770 build/trans_presets.java:3779
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:3664 build/trans_presets.java:3673
+#: build/trans_presets.java:3770 build/trans_presets.java:3779
 msgid "mixed"
 msgstr "blandingsskog"
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:3666
+#: build/trans_presets.java:3772
 msgid "Forest"
 msgstr "Skog"
@@ -31406,15 +32121,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:3669
+#: build/trans_presets.java:3775
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3675
+#: build/trans_presets.java:3781
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3782
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -31422,15 +32137,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:3681
+#: build/trans_presets.java:3787
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:3682
+#: build/trans_presets.java:3788
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:3686
+#: build/trans_presets.java:3792
 msgid "Fell"
 msgstr "Fjell"
@@ -31438,20 +32153,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:3688
+#: build/trans_presets.java:3794
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:3692
+#: build/trans_presets.java:3798
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:3693
+#: build/trans_presets.java:3799
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:3697
+#: build/trans_presets.java:3803
 msgid "Heath"
 msgstr "Beite"
@@ -31459,15 +32174,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:3699
+#: build/trans_presets.java:3805
 msgid "Edit Heath"
 msgstr "Rediger beite"
 
 #. group "Land use"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3810
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:3705
+#: build/trans_presets.java:3811
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -31476,45 +32191,56 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:3708
+#: build/trans_presets.java:3814
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3713
+#: build/trans_presets.java:3819
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:3714
+#: build/trans_presets.java:3820
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3719
+#: build/trans_presets.java:3825
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:3720
+#: build/trans_presets.java:3826
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3725
+#: build/trans_presets.java:3831
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:3726
+#: build/trans_presets.java:3832
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
+#. item "Land use/Greenhouse Horticulture"
+#: build/trans_presets.java:3837
+msgid "Greenhouse Horticulture"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
+#. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
+#: build/trans_presets.java:3839
+msgid "Edit Greenhouse Horticulture"
+msgstr ""
+
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3731
+#: build/trans_presets.java:3845
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:3732
+#: build/trans_presets.java:3846
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -31522,25 +32248,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:3738
+#: build/trans_presets.java:3852
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:3739
+#: build/trans_presets.java:3853
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3743
+#: build/trans_presets.java:3857
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:3744
+#: build/trans_presets.java:3858
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:3749
+#: build/trans_presets.java:3863
 msgid "Village Green"
 msgstr "Friområde"
@@ -31548,10 +32274,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:3751
+#: build/trans_presets.java:3865
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:3756
+#: build/trans_presets.java:3870
 msgid "Common"
 msgstr "Offentlig"
@@ -31559,20 +32285,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:3758
+#: build/trans_presets.java:3872
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3876
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3877
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:3767
+#: build/trans_presets.java:3881
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -31580,5 +32306,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:3769
+#: build/trans_presets.java:3883
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -31586,15 +32312,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3775
+#: build/trans_presets.java:3889
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:3776
+#: build/trans_presets.java:3890
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:3781
+#: build/trans_presets.java:3895
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -31602,10 +32328,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:3783
+#: build/trans_presets.java:3897
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:3789
+#: build/trans_presets.java:3903
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -31613,40 +32339,53 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:3791
+#: build/trans_presets.java:3905
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3798
+#: build/trans_presets.java:3912
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3913
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3804
+#: build/trans_presets.java:3918
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3919
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3810
+#: build/trans_presets.java:3924
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:3811
+#: build/trans_presets.java:3925
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
+#. item "Land use/Garages"
+#: build/trans_presets.java:3930
+#, fuzzy
+msgid "Garages"
+msgstr "Gress"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
+#. item "Land use/Garages" label "Edit Garages"
+#: build/trans_presets.java:3932
+#, fuzzy
+msgid "Edit Garages"
+msgstr "Rediger hage"
+
 #. item "Land use/Railway land"
-#: build/trans_presets.java:3816
+#: build/trans_presets.java:3938
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -31654,15 +32393,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:3818
+#: build/trans_presets.java:3940
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3823
+#: build/trans_presets.java:3945
 msgid "Military"
 msgstr "Militært"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:3824
+#: build/trans_presets.java:3946
 msgid "Edit Military Landuse"
 msgstr "Rediger militært"
@@ -31670,60 +32409,60 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3830
+#: build/trans_presets.java:3952
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:3831
+#: build/trans_presets.java:3953
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3836
+#: build/trans_presets.java:3958
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:3837
+#: build/trans_presets.java:3959
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3842
+#: build/trans_presets.java:3964
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:3843
+#: build/trans_presets.java:3965
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3848
+#: build/trans_presets.java:3970
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:3849
+#: build/trans_presets.java:3971
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3854
+#: build/trans_presets.java:3976
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:3855
+#: build/trans_presets.java:3977
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
 
 #. group "Annotation"
-#: build/trans_presets.java:3862
+#: build/trans_presets.java:3984
 msgid "Annotation"
 msgstr ""
 
 #. item "Annotation/Addresses"
-#: build/trans_presets.java:3863
+#: build/trans_presets.java:3985
 msgid "Addresses"
 msgstr "Adresser"
@@ -31732,5 +32471,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3988
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -31738,5 +32477,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:3868
+#: build/trans_presets.java:3990
 msgid "House number"
 msgstr "Husnummer"
@@ -31744,5 +32483,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:3870
+#: build/trans_presets.java:3992
 msgid "House name"
 msgstr "Husnavn"
@@ -31751,48 +32490,48 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:3871 build/trans_presets.java:3988
+#: build/trans_presets.java:3993 build/trans_presets.java:4110
 msgid "Street name"
 msgstr "Gatenavn"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:3872
+#: build/trans_presets.java:3994
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3995
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3996
 msgid "Country code"
 msgstr "Landskode"
 
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3996
 msgid "AT"
 msgstr ""
 
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3996
 msgid "CH"
 msgstr ""
 
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3996
 msgid "DE"
 msgstr ""
 
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3996
 msgid "FR"
 msgstr ""
 
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3996
 msgid "GB"
 msgstr ""
 
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3996
 msgid "IT"
 msgstr ""
 
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3996
 msgid "US"
 msgstr ""
@@ -31801,5 +32540,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:4002
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -31807,32 +32546,32 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:3882
+#: build/trans_presets.java:4004
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
-#: build/trans_presets.java:3882
+#: build/trans_presets.java:4004
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:3882
+#: build/trans_presets.java:4004
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:3882
+#: build/trans_presets.java:4004
 msgid "alphabetic"
 msgstr "alfabetisk"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:3884
+#: build/trans_presets.java:4006
 msgid "Contact"
 msgstr ""
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:3885
+#: build/trans_presets.java:4007
 msgid "Edit Contact information"
 msgstr ""
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:4016
 msgid "Image"
 msgstr "Bilde"
@@ -31842,5 +32581,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:4024
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -31852,5 +32591,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3908 build/trans_presets.java:3925
+#: build/trans_presets.java:4030 build/trans_presets.java:4047
 msgid "outer segment"
 msgstr "ytre linjesegment"
@@ -31858,5 +32597,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3909 build/trans_presets.java:3926
+#: build/trans_presets.java:4031 build/trans_presets.java:4048
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -31864,5 +32603,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:3912
+#: build/trans_presets.java:4034
 msgid "Boundary"
 msgstr "Grense"
@@ -31873,5 +32612,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:3917
+#: build/trans_presets.java:4039
 msgid "Edit Boundary"
 msgstr "Rediger grense"
@@ -31879,36 +32618,36 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3921
+#: build/trans_presets.java:4043
 msgid "Boundary type"
 msgstr "Grensetype"
 
-#: build/trans_presets.java:3921
+#: build/trans_presets.java:4043
 msgid "administrative"
 msgstr "administrativ"
 
-#: build/trans_presets.java:3921
+#: build/trans_presets.java:4043
 msgid "national"
 msgstr "nasjonal"
 
-#: build/trans_presets.java:3921
+#: build/trans_presets.java:4043
 msgid "civil"
 msgstr "kommunegrense"
 
-#: build/trans_presets.java:3921
+#: build/trans_presets.java:4043
 msgid "political"
 msgstr "politisk"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:4044
 msgid "Administrative level"
 msgstr "Administrativt nivå"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3927
+#: build/trans_presets.java:4049
 msgid "Sub area"
 msgstr "Delområde"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:3928
+#: build/trans_presets.java:4050
 msgid "Administration centre"
 msgstr "Administrativt senter"
@@ -31916,5 +32655,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:4053
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -31923,5 +32662,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:3934
+#: build/trans_presets.java:4056
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -31929,33 +32668,33 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:4058
 msgid "Restriction"
 msgstr "Forbud"
 
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:4058
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:4058
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:4058
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:4058
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:4058
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:4058
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:4058
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -31964,15 +32703,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3941
+#: build/trans_presets.java:4063
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3942
+#: build/trans_presets.java:4064
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:3943
+#: build/trans_presets.java:4065
 msgid "to way"
 msgstr "til linje"
@@ -31980,5 +32719,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:4068
 msgid "Route"
 msgstr "Rute"
@@ -31987,5 +32726,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:3949
+#: build/trans_presets.java:4071
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -31993,21 +32732,21 @@
 #. <key key="type" value="route" />
 #. item "Relations/Route" combo "Route type"
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:4073
 msgid "Route type"
 msgstr "Rutetype"
 
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:4073
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:4073
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:4073
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:4073
 msgid "ski"
 msgstr "ski"
@@ -32074,17 +32813,17 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:3951 build/trans_style.java:247
-#: build/trans_style.java:697 build/trans_style.java:705
-#: build/trans_style.java:731 build/trans_style.java:739
-#: build/trans_style.java:764 build/trans_style.java:765
-#: build/trans_style.java:773
+#: build/trans_presets.java:4073 build/trans_style.java:248
+#: build/trans_style.java:698 build/trans_style.java:706
+#: build/trans_style.java:732 build/trans_style.java:740
+#: build/trans_style.java:765 build/trans_style.java:766
+#: build/trans_style.java:774
 msgid "foot"
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:4073
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:4073
 msgid "detour"
 msgstr "omkjøring"
@@ -32098,10 +32837,10 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3951 build/trans_style.java:1294
+#: build/trans_presets.java:4073 build/trans_style.java:1295
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Symbol description"
-#: build/trans_presets.java:3954
+#: build/trans_presets.java:4076
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -32111,31 +32850,31 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:3957 build/trans_presets.java:3977
+#: build/trans_presets.java:4079 build/trans_presets.java:4099
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:4081
 msgid "Route state"
 msgstr "Rutetilstand"
 
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:4081
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:4081
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:4081
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:4081
 msgid "connection"
 msgstr "forbindelse"
 
 #. item "Relations/Route" text "Color (hex)"
-#: build/trans_presets.java:3960
+#: build/trans_presets.java:4082
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -32144,30 +32883,30 @@
 #. <roles>
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3963
+#: build/trans_presets.java:4085
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:4086
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3965
+#: build/trans_presets.java:4087
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3966
+#: build/trans_presets.java:4088
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3967
+#: build/trans_presets.java:4089
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "backward halt point"
-#: build/trans_presets.java:3968
+#: build/trans_presets.java:4090
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -32175,5 +32914,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:3971
+#: build/trans_presets.java:4093
 msgid "Route network"
 msgstr ""
@@ -32181,5 +32920,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:3973
+#: build/trans_presets.java:4095
 msgid "Edit route network"
 msgstr ""
@@ -32188,5 +32927,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:3981
+#: build/trans_presets.java:4103
 msgid "member"
 msgstr ""
@@ -32194,5 +32933,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:3984
+#: build/trans_presets.java:4106
 msgid "Associated street"
 msgstr ""
@@ -32200,13 +32939,16 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:4108
 msgid "Edit associated street"
 msgstr ""
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:3991
+#: build/trans_presets.java:4113
 msgid "house"
 msgstr ""
 
+#. <?xml version="1.0" encoding="UTF-8"?>
+#. <rules xmlns="http://josm.openstreetmap.de/mappaint-style-1.0"
+#. name="standard">
 #. <!--
 #. A little help:
@@ -32280,10 +33022,4 @@
 #. -->
 #.
-#. mappaint style named "standard"
-#: build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
-#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -32373,7 +33109,7 @@
 #. <condition k="tunnel" b="yes"/>
 #. color bridge
-#: build/trans_style.java:132 build/trans_style.java:146
-#: build/trans_style.java:153 build/trans_style.java:160
-#: build/trans_style.java:167
+#: build/trans_style.java:133 build/trans_style.java:147
+#: build/trans_style.java:154 build/trans_style.java:161
+#: build/trans_style.java:168
 msgid "bridge"
 msgstr "bro"
@@ -32424,5 +33160,5 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color deprecated
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="transport/car.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32438,8 +33174,8 @@
 #. <condition k="mountain_pass" b="yes"/>
 #. color deprecated
-#: build/trans_style.java:139 build/trans_style.java:174
-#: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:3006
-#: build/trans_style.java:4469
+#: build/trans_style.java:140 build/trans_style.java:175
+#: build/trans_style.java:182 build/trans_style.java:189
+#: build/trans_style.java:634 build/trans_style.java:3046
+#: build/trans_style.java:4517
 msgid "deprecated"
 msgstr "avleggs"
@@ -32481,5 +33217,5 @@
 #. <condition k="highway" v="bridleway"/>
 #. color horse
-#: build/trans_style.java:275 build/trans_style.java:681
+#: build/trans_style.java:276 build/trans_style.java:682
 msgid "horse"
 msgstr "hest"
@@ -32693,13 +33429,13 @@
 #. <rule>
 #. <condition k="barrier" v="block"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/block.png"/>
 #. color barrier
-#: build/trans_style.java:388 build/trans_style.java:401
-#: build/trans_style.java:402 build/trans_style.java:421
-#: build/trans_style.java:422 build/trans_style.java:441
-#: build/trans_style.java:442 build/trans_style.java:449
-#: build/trans_style.java:462 build/trans_style.java:463
-#: build/trans_style.java:476 build/trans_style.java:477
-#: build/trans_style.java:490 build/trans_style.java:491
+#: build/trans_style.java:389 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:422
+#: build/trans_style.java:423 build/trans_style.java:442
+#: build/trans_style.java:443 build/trans_style.java:450
+#: build/trans_style.java:463 build/trans_style.java:464
+#: build/trans_style.java:477 build/trans_style.java:478
+#: build/trans_style.java:491 build/trans_style.java:492
 msgid "barrier"
 msgstr "hinder"
@@ -32710,5 +33446,5 @@
 #. <rule>
 #. <condition k="barrier" v="border_control"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/border_control.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32762,5 +33498,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:548
+#: build/trans_style.java:549
 msgid "motorroad"
 msgstr "motortrafikkvei"
@@ -32816,7 +33552,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:1037
-#: build/trans_style.java:1045 build/trans_style.java:1053
-#: build/trans_style.java:1061 build/trans_style.java:1069
+#: build/trans_style.java:650 build/trans_style.java:1038
+#: build/trans_style.java:1046 build/trans_style.java:1054
+#: build/trans_style.java:1062 build/trans_style.java:1070
 msgid "highway_track"
 msgstr "traktorvei"
@@ -32916,5 +33652,5 @@
 #. <condition k="highway" v="rest_area"/>
 #. color services
-#: build/trans_style.java:867 build/trans_style.java:875
+#: build/trans_style.java:868 build/trans_style.java:876
 msgid "services"
 msgstr "service"
@@ -32928,5 +33664,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:883
+#: build/trans_style.java:884
 msgid "ford"
 msgstr "vadested"
@@ -32948,5 +33684,5 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color highway_platform
-#: build/trans_style.java:899 build/trans_style.java:900
+#: build/trans_style.java:900 build/trans_style.java:901
 msgid "highway_platform"
 msgstr ""
@@ -32959,5 +33695,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:907
+#: build/trans_style.java:908
 msgid "turningcircle"
 msgstr "vendesirkel"
@@ -32972,5 +33708,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:931
+#: build/trans_style.java:932
 msgid "emergency_access_point"
 msgstr "redningsmøtepunkt"
@@ -32984,5 +33720,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1087 build/trans_style.java:1088
+#: build/trans_style.java:1088 build/trans_style.java:1089
 msgid "riverbank"
 msgstr "elvebredd"
@@ -32996,5 +33732,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1104
+#: build/trans_style.java:1105
 msgid "stream"
 msgstr "bekk"
@@ -33008,5 +33744,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1127
+#: build/trans_style.java:1128
 msgid "dock"
 msgstr "tørrdokk"
@@ -33070,5 +33806,5 @@
 #. <rule>
 #. <condition k="waterway" v="dam"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="nautical/dam.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -33128,5 +33864,5 @@
 #. <rule>
 #. <condition k="man_made" v="groyne"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="nautical/groyne.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -33143,7 +33879,23 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="measurement_station"/>
+#. <icon annotate="true" src="misc/landmark/measurement_station.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="mineshaft"/>
 #. <icon annotate="true" src="misc/landmark/mine.png"/>
 #. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="adit"/>
+#. <icon annotate="true" src="misc/landmark/adit.png"/>
+#. color manmade
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33215,4 +33967,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="water_well"/>
+#. <icon annotate="true" src="misc/landmark/water_well.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="windmill"/>
 #. <icon annotate="true" src="misc/landmark/windmill.png"/>
@@ -33232,18 +33992,19 @@
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/water_works.png"/>
 #. color manmade
-#: build/trans_style.java:1150 build/trans_style.java:1179
-#: build/trans_style.java:1195 build/trans_style.java:1196
-#: build/trans_style.java:1204 build/trans_style.java:1697
-#: build/trans_style.java:1705 build/trans_style.java:1712
-#: build/trans_style.java:1720 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1785
-#: build/trans_style.java:1793 build/trans_style.java:1801
-#: build/trans_style.java:1809 build/trans_style.java:1816
+#: build/trans_style.java:1151 build/trans_style.java:1180
+#: build/trans_style.java:1196 build/trans_style.java:1197
+#: build/trans_style.java:1205 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1728
+#: build/trans_style.java:1736 build/trans_style.java:1745
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1817
 #: build/trans_style.java:1825 build/trans_style.java:1833
-#: build/trans_style.java:1841 build/trans_style.java:1849
-#: build/trans_style.java:1857
+#: build/trans_style.java:1841 build/trans_style.java:1848
+#: build/trans_style.java:1857 build/trans_style.java:1865
+#: build/trans_style.java:1873 build/trans_style.java:1881
+#: build/trans_style.java:1889 build/trans_style.java:1897
 msgid "manmade"
 msgstr "menneskeskapt"
@@ -33257,5 +34018,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1187
+#: build/trans_style.java:1188
 msgid "rapids"
 msgstr "stryk"
@@ -33317,7 +34078,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1214 build/trans_style.java:1229
-#: build/trans_style.java:1244 build/trans_style.java:1252
-#: build/trans_style.java:1260
+#: build/trans_style.java:1215 build/trans_style.java:1230
+#: build/trans_style.java:1245 build/trans_style.java:1253
+#: build/trans_style.java:1261
 msgid "railwaypoint"
 msgstr "jernbanepunkt"
@@ -33340,10 +34101,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1277 build/trans_style.java:1286
+#: build/trans_style.java:1278 build/trans_style.java:1287
 msgid "otherrail"
 msgstr "annen bane"
 
 #. color railover
-#: build/trans_style.java:1278
+#: build/trans_style.java:1279
 msgid "railover"
 msgstr "jernbanebro"
@@ -33377,7 +34138,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1302 build/trans_style.java:1312
-#: build/trans_style.java:1313 build/trans_style.java:1323
-#: build/trans_style.java:1324
+#: build/trans_style.java:1303 build/trans_style.java:1313
+#: build/trans_style.java:1314 build/trans_style.java:1324
+#: build/trans_style.java:1325
 msgid "oldrail"
 msgstr "nedlagt bane"
@@ -33414,5 +34175,5 @@
 #. <condition k="aeroway" v="aerodrome"/>
 #. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
+#. <icon annotate="true" src="transport/airport/runway.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33422,6 +34183,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1404 build/trans_style.java:1405
-#: build/trans_style.java:1437
+#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1438
 msgid "aeroway"
 msgstr "luftfart"
@@ -33443,9 +34204,9 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1421 build/trans_style.java:1429
+#: build/trans_style.java:1422 build/trans_style.java:1430
 msgid "aeroway_dark"
 msgstr "luftfart, mørk"
 
-#. <icon annotate="true" src="transport/airport.png"/>
+#. <icon annotate="true" src="transport/airport/taxiway.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33455,9 +34216,17 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1445
+#. <icon annotate="true" src="transport/airport/apron.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="hangar"/>
+#. color aeroway_light
+#: build/trans_style.java:1446 build/trans_style.java:1454
 msgid "aeroway_light"
 msgstr "luftfart, lys"
 
-#. <icon annotate="true" src="transport/airport.png"/>
+#. <icon annotate="true" src="transport/airport/hangar.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33466,5 +34235,5 @@
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
-#. <icon annotate="true" src="transport/airport/terminal.png"/>
+#. <icon annotate="true" src="transport/airport/gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33491,5 +34260,5 @@
 #. <condition k="aerialway" v="gondola"/>
 #. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <icon annotate="true" src="transport/aerialway/gondola.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33523,5 +34292,5 @@
 #. <condition k="aerialway" v="pylon"/>
 #. color aerialway
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/power/tower_small.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33531,12 +34300,12 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1469 build/trans_style.java:1477
-#: build/trans_style.java:1485 build/trans_style.java:1493
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517
+#: build/trans_style.java:1478 build/trans_style.java:1486
+#: build/trans_style.java:1494 build/trans_style.java:1502
+#: build/trans_style.java:1510 build/trans_style.java:1518
+#: build/trans_style.java:1526
 msgid "aerialway"
 msgstr "taubane"
 
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="transport/aerialway/goods.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33548,5 +34317,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1527 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_easy"
 msgstr "nedfart enkel"
@@ -33560,5 +34329,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1536 build/trans_style.java:1537
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_intermediate"
 msgstr "nedfart middels"
@@ -33572,5 +34341,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1545 build/trans_style.java:1546
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_advanced"
 msgstr "nedfart avansert"
@@ -33584,5 +34353,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1554 build/trans_style.java:1555
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_expert"
 msgstr "nedfart ekspert"
@@ -33596,5 +34365,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1563 build/trans_style.java:1564
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_freeride"
 msgstr "nedfart friløp"
@@ -33608,5 +34377,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1572 build/trans_style.java:1573
+#: build/trans_style.java:1581 build/trans_style.java:1582
 msgid "piste_novice"
 msgstr "nedfart nybegynner"
@@ -33667,4 +34436,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="cable_distribution_cabinet"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="wind"/>
 #. <icon annotate="true" src="misc/landmark/power/wind.png"/>
@@ -33726,11 +34502,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1584 build/trans_style.java:1598
-#: build/trans_style.java:1606 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
-#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1593 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1624
+#: build/trans_style.java:1632 build/trans_style.java:1647
 #: build/trans_style.java:1655 build/trans_style.java:1663
 #: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687
+#: build/trans_style.java:1687 build/trans_style.java:1695
+#: build/trans_style.java:1703
 msgid "power"
 msgstr "kraft"
@@ -33743,5 +34519,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1760 build/trans_style.java:1761
+#: build/trans_style.java:1792 build/trans_style.java:1793
 msgid "pier"
 msgstr "brygge"
@@ -33755,5 +34531,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1769
+#: build/trans_style.java:1801
 msgid "pipeline"
 msgstr "rørgate"
@@ -33905,13 +34681,13 @@
 #. <icon annotate="true" src="leisure/sauna.png"/>
 #. color leisure
-#: build/trans_style.java:1867 build/trans_style.java:1875
-#: build/trans_style.java:1883 build/trans_style.java:1891
-#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1907 build/trans_style.java:1915
 #: build/trans_style.java:1923 build/trans_style.java:1931
 #: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2003 build/trans_style.java:2011
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979 build/trans_style.java:1987
+#: build/trans_style.java:1995 build/trans_style.java:2003
+#: build/trans_style.java:2011 build/trans_style.java:2019
+#: build/trans_style.java:2027 build/trans_style.java:2035
+#: build/trans_style.java:2043 build/trans_style.java:2051
 msgid "leisure"
 msgstr "fritid"
@@ -33925,5 +34701,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1915
+#: build/trans_style.java:1955
 msgid "marina"
 msgstr "marina"
@@ -34019,10 +34795,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:2021 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2045
-#: build/trans_style.java:2053 build/trans_style.java:2061
-#: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:2085 build/trans_style.java:2093
-#: build/trans_style.java:2101
+#: build/trans_style.java:2061 build/trans_style.java:2069
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141
 msgid "amenity"
 msgstr "fasilitet"
@@ -34132,11 +34908,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2109 build/trans_style.java:2117
-#: build/trans_style.java:2125 build/trans_style.java:2133
-#: build/trans_style.java:2141 build/trans_style.java:2149
-#: build/trans_style.java:2157 build/trans_style.java:2165
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2188 build/trans_style.java:2197
-#: build/trans_style.java:2205
+#: build/trans_style.java:2149 build/trans_style.java:2157
+#: build/trans_style.java:2165 build/trans_style.java:2173
+#: build/trans_style.java:2181 build/trans_style.java:2189
+#: build/trans_style.java:2197 build/trans_style.java:2205
+#: build/trans_style.java:2213 build/trans_style.java:2221
+#: build/trans_style.java:2228 build/trans_style.java:2237
+#: build/trans_style.java:2245
 msgid "amenity_traffic"
 msgstr "fasilitet – trafikk"
@@ -34216,5 +34992,5 @@
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
-#. <icon annotate="true" src="service.png"/>
+#. <icon annotate="true" src="service/administration/embassy.png"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -34232,5 +35008,5 @@
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
-#. <icon annotate="true" src="service.png"/>
+#. <icon annotate="true" src="service/community_centre.png"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -34589,24 +35365,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2227 build/trans_style.java:2242
-#: build/trans_style.java:2250 build/trans_style.java:2258
-#: build/trans_style.java:2273 build/trans_style.java:2281
-#: build/trans_style.java:2289 build/trans_style.java:2297
-#: build/trans_style.java:2412 build/trans_style.java:2420
-#: build/trans_style.java:2427 build/trans_style.java:2436
-#: build/trans_style.java:2444 build/trans_style.java:2452
-#: build/trans_style.java:2460 build/trans_style.java:2468
-#: build/trans_style.java:2476 build/trans_style.java:2484
-#: build/trans_style.java:2492 build/trans_style.java:2555
-#: build/trans_style.java:2563 build/trans_style.java:2571
-#: build/trans_style.java:2580 build/trans_style.java:2588
-#: build/trans_style.java:2595 build/trans_style.java:2603
-#: build/trans_style.java:2611 build/trans_style.java:2619
-#: build/trans_style.java:2627 build/trans_style.java:2635
-#: build/trans_style.java:2643 build/trans_style.java:2651
-#: build/trans_style.java:2659 build/trans_style.java:2667
-#: build/trans_style.java:2675 build/trans_style.java:2683
-#: build/trans_style.java:2691 build/trans_style.java:2699
-#: build/trans_style.java:2708 build/trans_style.java:2723
+#: build/trans_style.java:2267 build/trans_style.java:2282
+#: build/trans_style.java:2290 build/trans_style.java:2298
+#: build/trans_style.java:2313 build/trans_style.java:2321
+#: build/trans_style.java:2329 build/trans_style.java:2337
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2467 build/trans_style.java:2476
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500 build/trans_style.java:2508
+#: build/trans_style.java:2516 build/trans_style.java:2524
+#: build/trans_style.java:2532 build/trans_style.java:2595
+#: build/trans_style.java:2603 build/trans_style.java:2611
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2635 build/trans_style.java:2643
+#: build/trans_style.java:2651 build/trans_style.java:2659
+#: build/trans_style.java:2667 build/trans_style.java:2675
+#: build/trans_style.java:2683 build/trans_style.java:2691
+#: build/trans_style.java:2699 build/trans_style.java:2707
+#: build/trans_style.java:2715 build/trans_style.java:2723
+#: build/trans_style.java:2731 build/trans_style.java:2739
+#: build/trans_style.java:2748 build/trans_style.java:2763
 msgid "amenity_light"
 msgstr "fasilitet – lys"
@@ -34638,6 +35414,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2305 build/trans_style.java:2313
-#: build/trans_style.java:3713
+#: build/trans_style.java:2345 build/trans_style.java:2353
+#: build/trans_style.java:3769
 msgid "light_water"
 msgstr "små vannsteder"
@@ -34673,5 +35449,5 @@
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="health/baby_hatch.png"/>
 #. color health
 #. <scale_min>1</scale_min>
@@ -34698,8 +35474,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2524
-#: build/trans_style.java:2531 build/trans_style.java:2539
-#: build/trans_style.java:2547
+#: build/trans_style.java:2539 build/trans_style.java:2547
+#: build/trans_style.java:2555 build/trans_style.java:2564
+#: build/trans_style.java:2571 build/trans_style.java:2579
+#: build/trans_style.java:2587
 msgid "health"
 msgstr "helse"
@@ -34721,5 +35497,5 @@
 #. <rule>
 #. <condition k="shop" v="convenience"/>
-#. <icon annotate="true" src="shop/supermarket.png"/>
+#. <icon annotate="true" src="shop/convenience.png"/>
 #. color shop
 #. <scale_min>1</scale_min>
@@ -34817,5 +35593,5 @@
 #. <rule>
 #. <condition k="shop" v="boutique"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="shop/boutique.png"/>
 #. color shop
 #. <scale_min>1</scale_min>
@@ -35129,5 +35905,5 @@
 #. <rule>
 #. <condition k="shop" v="stationery"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="shop/stationery.png"/>
 #. color shop
 #. <scale_min>1</scale_min>
@@ -35188,34 +35964,34 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2733 build/trans_style.java:2741
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2781 build/trans_style.java:2789
-#: build/trans_style.java:2797 build/trans_style.java:2805
-#: build/trans_style.java:2813 build/trans_style.java:2821
-#: build/trans_style.java:2829 build/trans_style.java:2837
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2957 build/trans_style.java:2965
-#: build/trans_style.java:2973 build/trans_style.java:2981
-#: build/trans_style.java:2989 build/trans_style.java:2997
-#: build/trans_style.java:3014 build/trans_style.java:3022
-#: build/trans_style.java:3030 build/trans_style.java:3038
-#: build/trans_style.java:3046 build/trans_style.java:3054
-#: build/trans_style.java:3062 build/trans_style.java:3070
-#: build/trans_style.java:3078 build/trans_style.java:3086
-#: build/trans_style.java:3094 build/trans_style.java:3102
-#: build/trans_style.java:3110 build/trans_style.java:3118
-#: build/trans_style.java:3126 build/trans_style.java:3134
-#: build/trans_style.java:3142 build/trans_style.java:3150
-#: build/trans_style.java:3158 build/trans_style.java:3166
-#: build/trans_style.java:3174 build/trans_style.java:3182
-#: build/trans_style.java:3190 build/trans_style.java:3198
-#: build/trans_style.java:3206 build/trans_style.java:3215
+#: build/trans_style.java:2773 build/trans_style.java:2781
+#: build/trans_style.java:2789 build/trans_style.java:2797
+#: build/trans_style.java:2805 build/trans_style.java:2813
+#: build/trans_style.java:2821 build/trans_style.java:2829
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2853 build/trans_style.java:2861
+#: build/trans_style.java:2869 build/trans_style.java:2877
+#: build/trans_style.java:2885 build/trans_style.java:2893
+#: build/trans_style.java:2901 build/trans_style.java:2909
+#: build/trans_style.java:2917 build/trans_style.java:2925
+#: build/trans_style.java:2933 build/trans_style.java:2941
+#: build/trans_style.java:2949 build/trans_style.java:2957
+#: build/trans_style.java:2965 build/trans_style.java:2973
+#: build/trans_style.java:2981 build/trans_style.java:2989
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3029 build/trans_style.java:3037
+#: build/trans_style.java:3054 build/trans_style.java:3062
+#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3086 build/trans_style.java:3094
+#: build/trans_style.java:3102 build/trans_style.java:3110
+#: build/trans_style.java:3118 build/trans_style.java:3126
+#: build/trans_style.java:3134 build/trans_style.java:3142
+#: build/trans_style.java:3150 build/trans_style.java:3158
+#: build/trans_style.java:3166 build/trans_style.java:3174
+#: build/trans_style.java:3182 build/trans_style.java:3190
+#: build/trans_style.java:3198 build/trans_style.java:3206
+#: build/trans_style.java:3214 build/trans_style.java:3222
+#: build/trans_style.java:3230 build/trans_style.java:3238
+#: build/trans_style.java:3246 build/trans_style.java:3255
 msgid "shop"
 msgstr "butikk"
@@ -35287,8 +36063,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:3225 build/trans_style.java:3233
-#: build/trans_style.java:3241 build/trans_style.java:3249
-#: build/trans_style.java:3257 build/trans_style.java:3265
-#: build/trans_style.java:3273 build/trans_style.java:3281
+#: build/trans_style.java:3265 build/trans_style.java:3273
+#: build/trans_style.java:3281 build/trans_style.java:3289
+#: build/trans_style.java:3297 build/trans_style.java:3305
+#: build/trans_style.java:3313 build/trans_style.java:3321
 msgid "hotel"
 msgstr "hotell"
@@ -35388,9 +36164,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3289 build/trans_style.java:3297
-#: build/trans_style.java:3305 build/trans_style.java:3313
-#: build/trans_style.java:3321 build/trans_style.java:3329
-#: build/trans_style.java:3330 build/trans_style.java:3338
-#: build/trans_style.java:3354 build/trans_style.java:3376
+#: build/trans_style.java:3329 build/trans_style.java:3337
+#: build/trans_style.java:3345 build/trans_style.java:3353
+#: build/trans_style.java:3361 build/trans_style.java:3369
+#: build/trans_style.java:3370 build/trans_style.java:3378
+#: build/trans_style.java:3394 build/trans_style.java:3416
 msgid "tourism"
 msgstr "turisme"
@@ -35478,9 +36254,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3386 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3426 build/trans_style.java:3434
+#: build/trans_style.java:3442 build/trans_style.java:3450
+#: build/trans_style.java:3458 build/trans_style.java:3466
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
 msgid "historic"
 msgstr "historisk"
@@ -35493,5 +36269,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3506
+#: build/trans_style.java:3546
 msgid "quarry"
 msgstr "steinbrudd"
@@ -35505,5 +36281,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3514
+#: build/trans_style.java:3554
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -35525,5 +36301,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3562 build/trans_style.java:3570
 msgid "basin"
 msgstr "vannmagasin"
@@ -35535,7 +36311,20 @@
 #.
 #. <rule>
+#. <condition k="landuse" v="garages"/>
+#. color garages
+#: build/trans_style.java:3618
+#, fuzzy
+msgid "garages"
+msgstr "gress"
+
+#. <icon src="misc/landuse/garages.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3570
+#: build/trans_style.java:3626
 msgid "farmyard"
 msgstr "gårdstun"
@@ -35558,5 +36347,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3579 build/trans_style.java:3587
+#: build/trans_style.java:3635 build/trans_style.java:3643
 msgid "retail"
 msgstr "butikker"
@@ -35570,5 +36359,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3595
+#: build/trans_style.java:3651
 msgid "industrial"
 msgstr "industri"
@@ -35582,5 +36371,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3603
+#: build/trans_style.java:3659
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -35594,5 +36383,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3611
+#: build/trans_style.java:3667
 msgid "greenfield"
 msgstr "byggeområde"
@@ -35606,5 +36395,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3619
+#: build/trans_style.java:3675
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -35661,7 +36450,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3636 build/trans_style.java:3671
-#: build/trans_style.java:3679 build/trans_style.java:3687
-#: build/trans_style.java:3695 build/trans_style.java:3703
+#: build/trans_style.java:3692 build/trans_style.java:3727
+#: build/trans_style.java:3735 build/trans_style.java:3743
+#: build/trans_style.java:3751 build/trans_style.java:3759
 msgid "military"
 msgstr "militært"
@@ -35675,5 +36464,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3644
+#: build/trans_style.java:3700
 msgid "cemetery"
 msgstr "gravlund"
@@ -35686,5 +36475,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3720
+#: build/trans_style.java:3776
 msgid "peak"
 msgstr "fjelltopp"
@@ -35699,5 +36488,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3729
+#: build/trans_style.java:3785
 msgid "glacier"
 msgstr "isbre"
@@ -35711,5 +36500,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3737
+#: build/trans_style.java:3793
 msgid "volcano"
 msgstr "vulkan"
@@ -35721,5 +36510,5 @@
 #. <rule>
 #. <condition k="natural" v="cliff"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="misc/cliff.png"/>
 #. color natural
 #. <scale_min>1</scale_min>
@@ -35745,5 +36534,5 @@
 #. <rule>
 #. <condition k="natural" v="bay"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="misc/bay.png"/>
 #. color natural
 #. <scale_min>1</scale_min>
@@ -35761,10 +36550,10 @@
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
-#. <icon src="vehicle/tunnel.png"/>
+#. <icon src="misc/landmark/cave_entrance.png"/>
 #. color natural
-#: build/trans_style.java:3745 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3770
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850
+#: build/trans_style.java:3801 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3826
+#: build/trans_style.java:3890 build/trans_style.java:3898
+#: build/trans_style.java:3906
 msgid "natural"
 msgstr "natur"
@@ -35778,5 +36567,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3762
+#: build/trans_style.java:3818
 msgid "scrub"
 msgstr "krattskog"
@@ -35790,5 +36579,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3778
+#: build/trans_style.java:3834
 msgid "heath"
 msgstr "beiteområde"
@@ -35802,5 +36591,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3786
+#: build/trans_style.java:3842
 msgid "woodarea"
 msgstr "skogsområde"
@@ -35812,7 +36601,7 @@
 #. <rule>
 #. <condition k="natural" v="mud"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:3818
+#: build/trans_style.java:3874
 msgid "mud"
 msgstr "søle"
@@ -35824,7 +36613,7 @@
 #. <rule>
 #. <condition k="natural" v="beach"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:3826
+#: build/trans_style.java:3882
 msgid "beach"
 msgstr "strand"
@@ -35902,8 +36691,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
+#: build/trans_style.java:3922 build/trans_style.java:3930
+#: build/trans_style.java:3938 build/trans_style.java:3946
+#: build/trans_style.java:3954 build/trans_style.java:3962
+#: build/trans_style.java:3970 build/trans_style.java:3978
 msgid "route"
 msgstr "rute"
@@ -35992,12 +36781,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3932 build/trans_style.java:3940
-#: build/trans_style.java:3944 build/trans_style.java:3948
-#: build/trans_style.java:3952 build/trans_style.java:3956
-#: build/trans_style.java:3960 build/trans_style.java:3964
-#: build/trans_style.java:3968 build/trans_style.java:3972
-#: build/trans_style.java:3976 build/trans_style.java:3981
-#: build/trans_style.java:3989 build/trans_style.java:3997
-#: build/trans_style.java:4005
+#: build/trans_style.java:3988 build/trans_style.java:3996
+#: build/trans_style.java:4000 build/trans_style.java:4004
+#: build/trans_style.java:4008 build/trans_style.java:4012
+#: build/trans_style.java:4016 build/trans_style.java:4020
+#: build/trans_style.java:4024 build/trans_style.java:4028
+#: build/trans_style.java:4032 build/trans_style.java:4037
+#: build/trans_style.java:4045 build/trans_style.java:4053
+#: build/trans_style.java:4061
 msgid "boundary"
 msgstr "grense"
@@ -36147,11 +36936,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4517 build/trans_style.java:4525
-#: build/trans_style.java:4533 build/trans_style.java:4541
-#: build/trans_style.java:4549 build/trans_style.java:4557
 #: build/trans_style.java:4565 build/trans_style.java:4573
 #: build/trans_style.java:4581 build/trans_style.java:4589
 #: build/trans_style.java:4597 build/trans_style.java:4605
-#: build/trans_style.java:4613
+#: build/trans_style.java:4613 build/trans_style.java:4621
+#: build/trans_style.java:4629 build/trans_style.java:4637
+#: build/trans_style.java:4645 build/trans_style.java:4653
+#: build/trans_style.java:4661
 msgid "place"
 msgstr "sted"
@@ -36165,5 +36954,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4621
+#: build/trans_style.java:4669
 msgid "tiger_data"
 msgstr "tiger-data"
@@ -36539,6 +37328,15 @@
 msgstr ""
 
-#~ msgid "Fix relations"
-#~ msgstr "Reparer relasjoner"
+#~ msgid "Multipolygon must consist only of closed ways."
+#~ msgstr "Multipolygon må bestå kun av lukkede linjer."
+
+#~ msgid "Travel"
+#~ msgstr "Reise"
+
+#~ msgid "Man-Made"
+#~ msgstr "Menneskeskapt"
+
+#~ msgid "standard"
+#~ msgstr "standard"
 
 #~ msgid "Move"
@@ -36588,7 +37386,4 @@
 #~ msgstr "Feil i kontrollsum: "
 
-#~ msgid "Zero coordinates: "
-#~ msgstr "Koodinater med null: "
-
 #~ msgid ""
 #~ "Internal Error: cannot check conditions for no layer. Please report this "
@@ -36654,7 +37449,4 @@
 #~ msgstr "Advarsel: {0}"
 
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326 (lengde- og breddegrad)"
-
 #~ msgid "their version:"
 #~ msgstr "annen versjon:"
@@ -36776,9 +37568,4 @@
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS-slutt: {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "bilde"
-#~ msgstr[1] "bilder"
 
 #~ msgid "{0} within the track."
@@ -36999,7 +37786,4 @@
 #~ msgstr "Lambert Zone 4 cache file (.4)"
 
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Bytt til kartprojeksjonen {0}."
-
 #~ msgid "Invalid projection"
 #~ msgstr "Ugyldig kartprojeksjon"
@@ -37013,7 +37797,4 @@
 #~ msgid "Open a layer first (GPX, OSM, cache)"
 #~ msgstr "Først åpne lag (GPX, OSM, mellomlager)"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Juster posisjon til WMS laget"
 
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
@@ -37063,4 +37844,7 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting."
+
+#~ msgid "Fix relations"
+#~ msgstr "Reparer relasjoner"
 
 #~ msgid "Joined self-overlapping area"
@@ -37372,7 +38156,4 @@
 #~ msgstr "Feil ved tolking"
 
-#~ msgid "File not found"
-#~ msgstr "Fant ikke fila"
-
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -37544,7 +38325,4 @@
 #~ msgid "Preparing..."
 #~ msgstr "Forbereder …"
-
-#~ msgid "Uploading..."
-#~ msgstr "Laster opp …"
 
 #~ msgid "Open images with AgPifoJ..."
