Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 17485)
+++ applications/editors/josm/i18n/po/nb.po	(revision 17595)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-06 13:51+0200\n"
+"POT-Creation-Date: 2009-09-12 18:11+0200\n"
 "PO-Revision-Date: 2009-08-15 13:39+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n"
+"X-Launchpad-Export-Date: 2009-09-12 16:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:193
+#: ../core/src/org/openstreetmap/josm/Main.java:194
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:203
+#: ../core/src/org/openstreetmap/josm/Main.java:204
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,18 +32,20 @@
 msgstr "Hjelp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:296
+#: ../core/src/org/openstreetmap/josm/Main.java:297
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:534
+#: ../core/src/org/openstreetmap/josm/Main.java:298
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/Main.java:519
+#: ../core/src/org/openstreetmap/josm/Main.java:543
+#: ../core/src/org/openstreetmap/josm/Main.java:551
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -59,8 +61,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
@@ -74,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -83,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
@@ -101,54 +103,51 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
 msgid "Error"
 msgstr "Feil"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/Main.java:446
+#, java-format
 msgid ""
 "There are unsaved changes in {0} layer. Discard the changes and continue?"
 msgid_plural ""
 "There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?"
-msgstr[1] "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:452
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:453
 msgid "Unsaved Changes"
 msgstr "Ulagrede endringer"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Save and Exit"
 msgstr "Lagre og avslutt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Discard and Exit"
 msgstr "Forkast og avslutt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
@@ -157,11 +156,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
@@ -175,20 +175,20 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:477
+#: ../core/src/org/openstreetmap/josm/Main.java:478
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Overser feilutformet URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:478
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:479
+#: ../core/src/org/openstreetmap/josm/Main.java:498
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,16 +205,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
@@ -244,12 +244,14 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:496
+#: ../core/src/org/openstreetmap/josm/Main.java:497
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Overser feilutformet fil-URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:509
-#: ../core/src/org/openstreetmap/josm/Main.java:533
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92
+#: ../core/src/org/openstreetmap/josm/Main.java:510
+#: ../core/src/org/openstreetmap/josm/Main.java:518
+#: ../core/src/org/openstreetmap/josm/Main.java:542
+#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
@@ -339,5 +341,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
 msgstr "Programtillegg"
@@ -352,20 +354,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "WARNING: unexpected format of API base URL. Redirection to info or history "
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere "
-"riktig til historikkside for OSM-element. API-URL er «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "WARNING: unexpected format of API base URL. Redirection to user page for OSM "
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere "
-"riktig til historikkside for OSM-element. API-URL er «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
@@ -473,9 +471,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -509,6 +507,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -527,11 +525,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
 msgstr "Informasjon"
@@ -553,5 +551,5 @@
 msgstr "Velg minst 3 noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
 #, java-format
 msgid ""
@@ -562,10 +560,10 @@
 "er {0}, maksimalt er {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
 msgid "API Capabilities Violation"
 msgstr "API-krav ikke møtt"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
 #, java-format
 msgid ""
@@ -575,5 +573,5 @@
 "Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
 #, java-format
 msgid ""
@@ -584,9 +582,9 @@
 "lengde {2}. Verdiens lengde er {3}."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
 msgid "Precondition Violation"
 msgstr "Forhåndsbetingelse brutt"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
@@ -641,26 +639,22 @@
 msgstr "Ingen konflikter å vise."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 msgid "Combine Way"
 msgstr "Sammenføy linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 msgid "Combine several ways into one."
 msgstr "Sammenføy flere linjer til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-msgid "Please select at least two ways to combine."
-msgstr "Velg minst to linjer å sammenføye."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58
 msgid "Combine ways with different memberships?"
 msgstr "Sammenføye linjer med forskjellig tilhørighet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Combine Anyway"
 msgstr "Sammenføy uansett"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -668,13 +662,13 @@
 msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
 msgid "Change directions?"
 msgstr "Endre retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Reverse and Combine"
 msgstr "Snu og sammenføy"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -684,30 +678,18 @@
 "retningen på noen av linjene?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
-msgid "Enter values for all conflicts."
-msgstr "Legg inn verdier for alle konflikter."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-msgid "Solve Conflicts"
-msgstr "Løs konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
-#, java-format
-msgid "Combine {0} ways"
-msgstr "Sammenføy {0} linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
-msgid "All the ways were empty"
-msgstr "Alle linjene var tomme"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
 "nodes)"
 msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
+#, java-format
+msgid "Combine {0} ways"
+msgstr "Sammenføy {0} linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228
+msgid "Please select at least two ways to combine."
+msgstr "Velg minst to linjer å sammenføye."
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
@@ -763,5 +745,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
 msgstr "Slett"
@@ -771,15 +753,15 @@
 msgstr "Slett valgte objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210
 msgid "File exists. Overwrite?"
 msgstr "Filen finnes. Vil du overskrive filen?"
@@ -808,10 +790,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #, java-format
 msgid "File: {0}"
@@ -842,5 +824,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
 #, java-format
@@ -883,7 +865,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202
-#, fuzzy
 msgid "All Formats"
-msgstr "Alle bilder"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -1020,1051 +1001,25 @@
 msgstr "Flett det gjeldende laget inn i et annet lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge Nodes"
 msgstr "Samle noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 msgid "Merge nodes into the oldest one."
 msgstr "Samle noder i den eldste"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
 msgid "Please select at least two nodes to merge."
 msgstr "Velg minst to noder til å samle"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
-msgid "Merge nodes with different memberships?"
-msgstr "Samle noder med forskjellige relasjoner?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
-msgid "Merge Anyway"
-msgstr "Samle noder allikevel"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-msgid ""
-"The selected nodes have differing relation memberships.  Do you still want "
-"to merge them?"
-msgstr ""
-"De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles "
-"samle noder?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301
-#, java-format
-msgid "Merge {0} nodes"
-msgstr "Samle {0} noder"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-msgid "Merge selection"
-msgstr "Flett utvalgte"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-msgid "Merge the currently selected primitives into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
-msgid "Mirror"
-msgstr "Speilvend"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-msgid "Mirror selected nodes and ways."
-msgstr "Speilvend valgte noder og linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
-msgid "Please select at least one node or way."
-msgstr "Velg minst én node eller linje."
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
-msgid "up"
-msgstr "opp"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
-#, java-format
-msgid "Move objects {0}"
-msgstr "Flytt objektene {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr "ned"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr "venstre"
-
-#. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
-msgid "right"
-msgstr "høyre"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
-#, java-format
-msgid "Move {0}"
-msgstr "Flytt {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, java-format
-msgid "Moves Objects {0}"
-msgstr "Flytter Objekter {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-msgid "Cannot move objects outside of the world."
-msgstr "Kan ikke flytte objekter utenfor kartet."
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
-msgid "New"
-msgstr "Ny"
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-msgid "Create a new map."
-msgstr "Lag et nytt kart."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
-msgid "Open..."
-msgstr "Åpne …"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
-msgid "Open a file."
-msgstr "Åpne en fil."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65
-#, fuzzy
-msgid "Opening files"
-msgstr "Åpne en fil."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84
-#, fuzzy, java-format
-msgid "Opening file ''{0}'' ..."
-msgstr "Ukjent rolle «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-msgid "Open Location..."
-msgstr "Åpne sted …"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-msgid "Open an URL."
-msgstr "Åpne en URL."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
-msgid "Separate Layer"
-msgstr "Separat lag"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
-msgid "Enter URL to download:"
-msgstr "Oppgi URL for nedlasting:"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
-msgid "Download Location"
-msgstr "Last ned sted"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Download URL"
-msgstr "Last ned URL"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Orthogonalize Shape"
-msgstr "Vinkle Form"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
-msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
-msgid "Only two nodes allowed"
-msgstr "Bare to noder tillatt"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
-msgid "Selection must consist only of ways."
-msgstr "Du kan bare velge linjer."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
-msgid "Please select one or more closed ways of at least four nodes."
-msgstr "Velg en eller flere lukkede linjer med minst fire noder."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
-msgid ""
-"<html>You are using the EPSG:4326 projection which might lead<br>to "
-"undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
-msgid "Only one node selected"
-msgstr "Bare én node er valgt"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
-msgid "Orthogonalize"
-msgstr "Vinkle (90)"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
-msgid "Paste"
-msgstr "Lim inn"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-msgid "Paste contents of paste buffer."
-msgstr "Lim inn fra utklippstavla."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
-msgid "Paste Tags"
-msgstr "Lim inn egenskaper"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
-msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "Bruk egenskaper i utklippstavla på alle valgte element."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116
-#, fuzzy, java-format
-msgid "Pasting {0} tag"
-msgid_plural "Pasting {0} tags"
-msgstr[0] "Laster {0}"
-msgstr[1] "Laster {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117
-#, fuzzy, java-format
-msgid "to {0} primitive"
-msgid_plural "to {0} primtives"
-msgstr[0] "Gjenopprett {0} objekter"
-msgstr[1] "Gjenopprett {0} objekter"
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Preferences..."
-msgstr "Innstillinger …"
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Open a preferences page for global settings."
-msgstr "Åpne side med globale innstillinger."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
-msgid "Preferences"
-msgstr "Innstillinger"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-msgid "Redo"
-msgstr "Gjør om"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Gjør om siste angrede handling."
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
-msgid "Rename layer"
-msgstr "Endre navn på lag"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
-msgid "Also rename the file"
-msgstr "Gi nytt navn på fil også"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
-#, java-format
-msgid "Could not rename file ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-msgid "Reverse Ways"
-msgstr "Snu retning på linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-msgid "Reverse the direction of all selected ways."
-msgstr "Snu retning på alle valgte linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
-msgid "Please select at least one way."
-msgstr "Velg minst én linje"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
-msgid "Reverse ways"
-msgstr "Snu retning på linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
-msgid "Save"
-msgstr "Lagre"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
-msgid "Save the current data."
-msgstr "Lagre gjeldende data."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#, java-format
-msgid "File {0} exists. Overwrite?"
-msgstr "Filen {0} finnes allerede. Vil du skrive over den?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-msgid "No Exporter found! Nothing saved."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "Empty document"
-msgstr "Tomt dokument"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "The document contains no data."
-msgstr "Dokumentet er tomt."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "Save anyway"
-msgstr "Lagre uansett"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
-msgid "Conflicts"
-msgstr "Konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Det finnes konflikter som må løses. Element med konflikter lagres ikke. Vil "
-"du fortsette?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-msgid "Reject Conflicts and Save"
-msgstr "Avvis konflikter og lagre"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
-msgid "Save OSM file"
-msgstr "Lagre OSM-fil"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
-msgid "Save GPX file"
-msgstr "Lagre GPX-fil"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
-msgid "Save Layer"
-msgstr "Lagre lag"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
-msgid "Save As..."
-msgstr "Lagre som …"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
-msgid "Save the current data to a new file."
-msgstr "Lagre aktive data i ny fil."
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-msgid "Select All"
-msgstr "Velg alt"
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-msgid ""
-"Select all undeleted objects in the data layer. This selects incomplete "
-"objects too."
-msgstr ""
-"Velg alle data i lag som ikke er slettet. OBS uferdige data blir også valgt."
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr "Vis statusrapport"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
-msgid "Show status report with useful information that can be attached to bugs"
-msgstr "Vis statusrapport med informasjon for feilsøking"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
-#, java-format
-msgid "Help: {0}"
-msgstr "Hjelp: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-msgid "Status Report"
-msgstr "Statusrapport"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
-msgid "Copy to clipboard and close"
-msgstr "Kopier til utklippstavlen og lukk"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
-msgid "Close"
-msgstr "Lukk"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-msgid "Split Way"
-msgstr "Splitt linje"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-msgid "Split a way at the selected node."
-msgstr "Splitt en linje i den valgte noden."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
-msgid "The current selection cannot be used for splitting."
-msgstr "Kan ikke splitte med dette utvalget"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
-msgid "The selected node is not in the middle of any way."
-msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "Valgt node er ikke del av en linje."
-msgstr[1] "Valgte noder er ikke del av en linje."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
-msgid ""
-"There is more than one way using the node you selected. Please select the "
-"way also."
-msgid_plural ""
-"There is more than one way using the nodes you selected. Please select the "
-"way also."
-msgstr[0] "Mer enn én linje bruker den  valgte noden. Velg flere linjer."
-msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
-msgid "The selected nodes do not share the same way."
-msgstr "Valgte noder er ikke på samme linje."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Valgt linje inneholder ikke valgt node."
-msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
-msgid "You must select two or more nodes to split a circular way."
-msgstr "Velg to eller fler noder for å splitte sirkelformet linje."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
-msgid ""
-"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
-"middle of the way.)"
-msgstr ""
-"Linje kan ikke splittes i valgt node. (Tips: velg noder mot midten av "
-"linjen.)"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
-msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
-#, java-format
-msgid "Split way {0} into {1} parts"
-msgstr "Splitt linje {0} i {1} deler"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-#, fuzzy
-msgid "Close current changeset"
-msgstr "Lukker endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#, fuzzy
-msgid "Close the current changeset ..."
-msgstr "Lukker endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-#, fuzzy
-msgid "No open changeset"
-msgstr "Åpner endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-#, fuzzy
-msgid "Closing changeset"
-msgstr "Lukker endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-msgid "Toggle GPX Lines"
-msgstr "Slå av/på GPX-linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-msgid "Draw lines between raw gps points."
-msgstr "Trekk linjer mellom GPS-punkt."
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#, java-format
-msgid "Toggles the global setting ''{0}''."
-msgstr "Slår av/på global innstilling «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-msgid "UnGlue Ways"
-msgstr "Fjern knytning til linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Dupliser noder som er med i flere linjer."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
-msgid "This node is not glued to anything else."
-msgstr "Denne noden har ikke knytninger"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
-msgid "None of these nodes are glued to anything else."
-msgstr "Ingen av disse nodene har knytninger."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
-msgid "None of this way's nodes are glued to anything else."
-msgstr "Ingen noder i denne linjen har andre knytninger."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid "The current selection cannot be used for unglueing."
-msgstr "Valgte element har ikke knytninger som kan løses."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "Select either:"
-msgstr "Velg:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
-msgid "* One tagged node, or"
-msgstr "* En node med egenskaper, eller"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid "* One node that is used by more than one way, or"
-msgstr "– En node som brukes av flere linjer, eller"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr "– En node som er brukt av flere linjer, og en av linjene, eller"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr ""
-"– En linje som har en eller flere noder, som er brukt av flere linjer, eller"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
-msgid ""
-"Note: If a way is selected, this way will get fresh copies of the unglued\n"
-"nodes and the new nodes will be selected. Otherwise, all ways will get "
-"their\n"
-"own copy and all nodes will be selected."
-msgstr ""
-"Merk: Når du velger en linje, vil denne få nye kopier av noder uten\n"
-"tilknytninger og nodene bli valgt. Ellers vil alle linjer få egne\n"
-"kopier og alle noder bli valgt."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
-msgid "Unglued Node"
-msgstr "Node uten tilknytning"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
-#, java-format
-msgid "Dupe into {0} nodes"
-msgstr "Kopier til {0} noder"
-
-#. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr "Kopier {0} noder til {1} noder"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-msgid "Undo"
-msgstr "Angre"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Angre siste handling."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
-msgid "Unselect All"
-msgstr "Tøm utvalg"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-msgid "Unselect all objects."
-msgstr "Fjern alle objekter fra utvalg."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-msgid "Unselect All (Focus)"
-msgstr "Tøm utvalg (Fokus)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-msgid "Unselect All (Escape)"
-msgstr "Tøm utvalg (Escape)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
-msgid "Update Data"
-msgstr "Oppdater data"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)"
-
-#. bounds defined? => use the bbox downloader
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
-msgid "No current dataset found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
-msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
-msgid "Update Selection"
-msgstr "Oppdater utvalg"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
-msgid "Updates the currently selected primitives from the server"
-msgstr "Oppdaterer de valgte objektene fra tjeneren"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
-msgid "There are no selected primitives to update."
-msgstr "Det er ingen valgte objekter å oppdatere"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
-msgid "Selection empty"
-msgstr "Utvalget er tomt"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
-msgid "Upload to OSM..."
-msgstr "Last opp til OSM …"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-msgid "Upload all changes to the OSM server."
-msgstr "Last opp alle endringer til OSM-tjeneren."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#, fuzzy, java-format
-msgid ""
-"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-"resolve them first.<html>"
-msgstr "Data inneholder uløste konflikter som først må løses."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
-msgid "Nothing to upload. Get some data first."
-msgstr "Ingen endringer å laste opp. Finn frem data først."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
-msgid "No changes to upload."
-msgstr "Ingen endringer å laste opp."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr "Synkroniser kun {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
-msgid "Synchronize entire dataset"
-msgstr "Synkroniser hele datasettet"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>Upplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
-"av en<br>lokal node, linje eller relasjon.<br>Konflikten er forårsaket av "
-"<strong>{0}</strong> med ID <strong>{1}</strong>,<br>tjeneren har versjon "
-"{2}, lokal versjon er {3}.<br><br>Trykk <strong>{4}</strong> for å "
-"synkronisere kun konfliktelementet.<br>Trykk <strong>{5}</strong> for å "
-"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{6}</"
-"strong> for å gå tilbake og fortsette å redigere.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
-msgid "Conflict detected"
-msgstr "Konflikt oppdaget"
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr "Uventet returverdi. Mottok {0}."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>Opplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
-"av en node, linje ellerrelasjon.<br><br>Trykk <strong>{0}</strong> for å "
-"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{1}</"
-"strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309
-#, java-format
-msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347
-#, java-format
-msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Opplasting <strong>feilet</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405
-msgid "Upload to OSM API failed"
-msgstr "Klarte ikke laste opp til OSM-API"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427
-msgid "Updating primitive"
-msgstr "Oppdaterer objekt"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474
-msgid "Upload these changes?"
-msgstr "Laste opp disse endringene?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
-msgid "Upload Changes"
-msgstr "Last opp endringer"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527
-#, fuzzy, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr "Rediger ny relasjon i lag \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658
-#, fuzzy
-msgid "Upload to a new or to an existing changeset?"
-msgstr "Legg til en node i eksisterende linje"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680
-msgid "upload all changes in one request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Gi en kort kommentar for endringene du laster opp:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731
-#, fuzzy
-msgid "Settings"
-msgstr "Innstillinger for kart"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936
-#, fuzzy
-msgid "Tags of new changeset"
-msgstr "endringssett"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755
-msgid "Objects to add:"
-msgstr "Objekter som legges til:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761
-msgid "Objects to modify:"
-msgstr "Objekter som endres:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767
-msgid "Objects to delete:"
-msgstr "Objekter som slettes:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:803
-#, fuzzy, java-format
-msgid "{0} object to add:"
-msgid_plural "{0} objects to add:"
-msgstr[0] "Objekter som legges til:"
-msgstr[1] "Objekter som legges til:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812
-#, fuzzy, java-format
-msgid "{0} object to modifiy:"
-msgid_plural "{0} objects to modify:"
-msgstr[0] "Objekter som endres:"
-msgstr[1] "Objekter som endres:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821
-#, fuzzy, java-format
-msgid "{0} object to delete:"
-msgid_plural "{0} objects to delete:"
-msgstr[0] "Objekter som slettes:"
-msgstr[1] "Objekter som slettes:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942
-#, fuzzy, java-format
-msgid "Tags of changeset {0}"
-msgstr "Siste endring på {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-msgid "Zoom In"
-msgstr "Zoom inn"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-msgid "Zoom Out"
-msgstr "Zoom ut"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-msgid "Back"
-msgstr "Tilbake"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-msgid "Jump back."
-msgstr "Hopp tilbake."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-#, java-format
-msgid "Audio: {0}"
-msgstr "Audio: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-msgid "Faster"
-msgstr "Raskere"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-msgid "Faster Forward"
-msgstr "Rask Avspilling"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-msgid "Forward"
-msgstr "Spill av"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-msgid "Jump forward"
-msgstr "Neste spor"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-msgid "Next Marker"
-msgstr "Neste merke"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-msgid "Play next marker."
-msgstr "Spill fra neste merke"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-msgid "Play/Pause"
-msgstr "Spill/Pause"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-msgid "Play/pause audio."
-msgstr "Spill/Pause audio."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-msgid "Previous Marker"
-msgstr "Forrige merke"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-msgid "Play previous marker."
-msgstr "Spill av forrige merke"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-msgid "Slower"
-msgstr "Saktere"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-msgid "Slower Forward"
-msgstr "Spill av sakte"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
-msgid "Downloading GPS data"
-msgstr "Laster ned GPS-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
-msgid "Downloaded GPX Data"
-msgstr "Laster ned GPX-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
-msgid "Raw GPS data"
-msgstr "GPS-rådata"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
-msgid "Downloading data"
-msgstr "Laster ned data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, java-format
-msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119
-msgid "No data imported."
-msgstr "Ingenting er importert."
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
-#, java-format
-msgid "Download {0} of {1} ({2} left)"
-msgstr "Last ned {0} av {1} ({2} gjenstår)"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110
-msgid "Errors during Download"
-msgstr "Feil under nedlasting"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175
-#, java-format
-msgid ""
-"<html>There are {0} primitives in your local dataset which<br>might be "
-"deleted on the server. If you later try to delete or<br>update them the "
-"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
-msgstr ""
-"<html>Det er {0} elementer i det lokale datasettet som<br>kan være slettet "
-"på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere dem, vil "
-"tjeneren sannsynligvis rapportere om en<br>konflikt.<br><br>Trykk <strong>{1}"
-"</strong> for å sjekke status for disse elementene<br>på tjeneren.<br>Trykk "
-"<strong>{2}</strong> for å ignorere.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191
-msgid "Deleted or moved primitives"
-msgstr "Slettede eller flyttede objekter"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
-msgid "Delete Mode"
-msgstr "Slettemodus"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
-msgid "Delete nodes or ways."
-msgstr "Slett noder eller linjer."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
-#, java-format
-msgid "Mode: {0}"
-msgstr "Modus: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
-"when deleting a way. Ctrl: delete referring objects."
-msgstr ""
-"Klikk for å slette. Shift: slett linjesegment. Alt: Ikke slett ubrukte noder "
-"når linjer slettes. Ctrl: slett objekt med referanse."
-
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -2075,7 +1030,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
@@ -2084,6 +1040,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -2114,4 +1070,894 @@
 msgstr "parameter «{0}» må ha en verdi"
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+msgid "Cannot merge nodes: Would have to delete a way that is still used."
+msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "Samle {0} noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+msgid "Merge selection"
+msgstr "Flett utvalgte"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
+msgid "Merge the currently selected primitives into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+msgid "Mirror"
+msgstr "Speilvend"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+msgid "Mirror selected nodes and ways."
+msgstr "Speilvend valgte noder og linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+msgid "Please select at least one node or way."
+msgstr "Velg minst én node eller linje."
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+msgid "up"
+msgstr "opp"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#, java-format
+msgid "Move objects {0}"
+msgstr "Flytt objektene {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+msgid "down"
+msgstr "ned"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+msgid "left"
+msgstr "venstre"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+msgid "right"
+msgstr "høyre"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr "Flytt {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "Flytter Objekter {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+msgid "Cannot move objects outside of the world."
+msgstr "Kan ikke flytte objekter utenfor kartet."
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+msgid "New"
+msgstr "Ny"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+msgid "Create a new map."
+msgstr "Lag et nytt kart."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+msgid "Open..."
+msgstr "Åpne …"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+msgid "Open a file."
+msgstr "Åpne en fil."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+msgid "Opening files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+msgid "Open Location..."
+msgstr "Åpne sted …"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+msgid "Open an URL."
+msgstr "Åpne en URL."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
+msgid "Separate Layer"
+msgstr "Separat lag"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
+msgid "Enter URL to download:"
+msgstr "Oppgi URL for nedlasting:"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
+msgid "Download Location"
+msgstr "Last ned sted"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+msgid "Download URL"
+msgstr "Last ned URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
+msgid "Orthogonalize Shape"
+msgstr "Vinkle Form"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
+msgid "Only two nodes allowed"
+msgstr "Bare to noder tillatt"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+msgid "Selection must consist only of ways."
+msgstr "Du kan bare velge linjer."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+msgid "Please select one or more closed ways of at least four nodes."
+msgstr "Velg en eller flere lukkede linjer med minst fire noder."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
+msgid "Only one node selected"
+msgstr "Bare én node er valgt"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
+msgid "Orthogonalize"
+msgstr "Vinkle (90)"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
+msgid "Paste"
+msgstr "Lim inn"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+msgid "Paste contents of paste buffer."
+msgstr "Lim inn fra utklippstavla."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+msgid "Paste Tags"
+msgstr "Lim inn egenskaper"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr "Bruk egenskaper i utklippstavla på alle valgte element."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124
+#, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125
+#, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Preferences..."
+msgstr "Innstillinger …"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Open a preferences page for global settings."
+msgstr "Åpne side med globale innstillinger."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo"
+msgstr "Gjør om"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Gjør om siste angrede handling."
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+msgid "Rename layer"
+msgstr "Endre navn på lag"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+msgid "Also rename the file"
+msgstr "Gi nytt navn på fil også"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#, java-format
+msgid "Could not rename file ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse Ways"
+msgstr "Snu retning på linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+msgid "Reverse the direction of all selected ways."
+msgstr "Snu retning på alle valgte linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+msgid "Please select at least one way."
+msgstr "Velg minst én linje"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+msgid "Reverse ways"
+msgstr "Snu retning på linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
+msgid "Save"
+msgstr "Lagre"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
+msgid "Save the current data."
+msgstr "Lagre gjeldende data."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr "Filen {0} finnes allerede. Vil du skrive over den?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+msgid "No Exporter found! Nothing saved."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
+msgid "Empty document"
+msgstr "Tomt dokument"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+msgid "Save anyway"
+msgstr "Lagre uansett"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "The document contains no data."
+msgstr "Dokumentet er tomt."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Conflicts"
+msgstr "Konflikter"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+msgid "Reject Conflicts and Save"
+msgstr "Avvis konflikter og lagre"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Det finnes konflikter som må løses. Element med konflikter lagres ikke. Vil "
+"du fortsette?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+msgid "Save OSM file"
+msgstr "Lagre OSM-fil"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+msgid "Save GPX file"
+msgstr "Lagre GPX-fil"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+msgid "Save Layer"
+msgstr "Lagre lag"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
+msgid "Save As..."
+msgstr "Lagre som …"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
+msgid "Save the current data to a new file."
+msgstr "Lagre aktive data i ny fil."
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid "Select All"
+msgstr "Velg alt"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+"Velg alle data i lag som ikke er slettet. OBS uferdige data blir også valgt."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+msgid "Show Status Report"
+msgstr "Vis statusrapport"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr "Vis statusrapport med informasjon for feilsøking"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#, java-format
+msgid "Help: {0}"
+msgstr "Hjelp: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+msgid "Status Report"
+msgstr "Statusrapport"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+msgid "Copy to clipboard and close"
+msgstr "Kopier til utklippstavlen og lukk"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
+msgid "Close"
+msgstr "Lukk"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+msgid "Split Way"
+msgstr "Splitt linje"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+msgid "Split a way at the selected node."
+msgstr "Splitt en linje i den valgte noden."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+msgid "The current selection cannot be used for splitting."
+msgstr "Kan ikke splitte med dette utvalget"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "Valgt node er ikke del av en linje."
+msgstr[1] "Valgte noder er ikke del av en linje."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] "Mer enn én linje bruker den  valgte noden. Velg flere linjer."
+msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+msgid "The selected nodes do not share the same way."
+msgstr "Valgte noder er ikke på samme linje."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] "Valgt linje inneholder ikke valgt node."
+msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+msgid "You must select two or more nodes to split a circular way."
+msgstr "Velg to eller fler noder for å splitte sirkelformet linje."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr ""
+"Linje kan ikke splittes i valgt node. (Tips: velg noder mot midten av "
+"linjen.)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "Splitt linje {0} i {1} deler"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
+msgid "Close current changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
+msgid "Close the current changeset ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
+msgid "There is currently no changeset open."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Toggle GPX Lines"
+msgstr "Slå av/på GPX-linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+msgid "Draw lines between raw gps points."
+msgstr "Trekk linjer mellom GPS-punkt."
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+msgstr "Slår av/på global innstilling «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+msgid "UnGlue Ways"
+msgstr "Fjern knytning til linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+msgid "Duplicate nodes that are used by multiple ways."
+msgstr "Dupliser noder som er med i flere linjer."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+msgid "This node is not glued to anything else."
+msgstr "Denne noden har ikke knytninger"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+msgid "None of these nodes are glued to anything else."
+msgstr "Ingen av disse nodene har knytninger."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+msgid "None of this way's nodes are glued to anything else."
+msgstr "Ingen noder i denne linjen har andre knytninger."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "The current selection cannot be used for unglueing."
+msgstr "Valgte element har ikke knytninger som kan løses."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "Select either:"
+msgstr "Velg:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+msgid "* One tagged node, or"
+msgstr "* En node med egenskaper, eller"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+msgid "* One node that is used by more than one way, or"
+msgstr "– En node som brukes av flere linjer, eller"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr "– En node som er brukt av flere linjer, og en av linjene, eller"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr ""
+"– En linje som har en eller flere noder, som er brukt av flere linjer, eller"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+"Merk: Når du velger en linje, vil denne få nye kopier av noder uten\n"
+"tilknytninger og nodene bli valgt. Ellers vil alle linjer få egne\n"
+"kopier og alle noder bli valgt."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+msgid "Unglued Node"
+msgstr "Node uten tilknytning"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr "Kopier til {0} noder"
+
+#. only one changeCommand for a way, else garbage will happen
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#, java-format
+msgid "Dupe {0} nodes into {1} nodes"
+msgstr "Kopier {0} noder til {1} noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo"
+msgstr "Angre"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Angre siste handling."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+msgid "Unselect All"
+msgstr "Tøm utvalg"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+msgid "Unselect all objects."
+msgstr "Fjern alle objekter fra utvalg."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+msgid "Unselect All (Focus)"
+msgstr "Tøm utvalg (Fokus)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+msgid "Unselect All (Escape)"
+msgstr "Tøm utvalg (Escape)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+msgid "Update Data"
+msgstr "Oppdater data"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
+msgid "Updates the current data layer from the server (re-downloads data)"
+msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)"
+
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
+msgid "No current dataset found"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+msgid "Didn't find a primitive with id {0} in the current dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
+msgid "Update Selection"
+msgstr "Oppdater utvalg"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
+msgid "Updates the currently selected primitives from the server"
+msgstr "Oppdaterer de valgte objektene fra tjeneren"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
+msgid "There are no selected primitives to update."
+msgstr "Det er ingen valgte objekter å oppdatere"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
+msgid "Selection empty"
+msgstr "Utvalget er tomt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+msgid "Upload to OSM..."
+msgstr "Last opp til OSM …"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "Upload all changes to the OSM server."
+msgstr "Last opp alle endringer til OSM-tjeneren."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#, java-format
+msgid ""
+"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+"resolve them first.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+msgid "Nothing to upload. Get some data first."
+msgstr "Ingen endringer å laste opp. Finn frem data først."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+msgid "No changes to upload."
+msgstr "Ingen endringer å laste opp."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr "Synkroniser kun {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+msgid "Synchronize entire dataset"
+msgstr "Synkroniser hele datasettet"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
+"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>Upplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
+"av en<br>lokal node, linje eller relasjon.<br>Konflikten er forårsaket av "
+"<strong>{0}</strong> med ID <strong>{1}</strong>,<br>tjeneren har versjon "
+"{2}, lokal versjon er {3}.<br><br>Trykk <strong>{4}</strong> for å "
+"synkronisere kun konfliktelementet.<br>Trykk <strong>{5}</strong> for å "
+"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{6}</"
+"strong> for å gå tilbake og fortsette å redigere.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+msgid "Conflict detected"
+msgstr "Konflikt oppdaget"
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#, java-format
+msgid "unexpected return value. Got {0}"
+msgstr "Uventet returverdi. Mottok {0}."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>Opplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
+"av en node, linje ellerrelasjon.<br><br>Trykk <strong>{0}</strong> for å "
+"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{1}</"
+"strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#, java-format
+msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#, java-format
+msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
+msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#, java-format
+msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+msgstr "<html>Opplasting <strong>feilet</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+msgid "Upload to OSM API failed"
+msgstr "Klarte ikke laste opp til OSM-API"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+msgid "Updating primitive"
+msgstr "Oppdaterer objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+msgid "Zoom In"
+msgstr "Zoom inn"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+msgid "Zoom Out"
+msgstr "Zoom ut"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgid "Back"
+msgstr "Tilbake"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+msgid "Jump back."
+msgstr "Hopp tilbake."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#, java-format
+msgid "Audio: {0}"
+msgstr "Audio: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgid "Faster"
+msgstr "Raskere"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+msgid "Faster Forward"
+msgstr "Rask Avspilling"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgid "Forward"
+msgstr "Spill av"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+msgid "Jump forward"
+msgstr "Neste spor"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgid "Next Marker"
+msgstr "Neste merke"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+msgid "Play next marker."
+msgstr "Spill fra neste merke"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/Pause"
+msgstr "Spill/Pause"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "Spill/Pause audio."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgid "Previous Marker"
+msgstr "Forrige merke"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgid "Play previous marker."
+msgstr "Spill av forrige merke"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgid "Slower"
+msgstr "Saktere"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+msgid "Slower Forward"
+msgstr "Spill av sakte"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
+msgid "Downloading GPS data"
+msgstr "Laster ned GPS-data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
+msgid "Downloaded GPX Data"
+msgstr "Laster ned GPX-data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
+msgid "Raw GPS data"
+msgstr "GPS-rådata"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
+msgid "Downloading data"
+msgstr "Laster ned data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
+msgid "No data imported."
+msgstr "Ingenting er importert."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap-data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr "Last ned {0} av {1} ({2} gjenstår)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
+#, java-format
+msgid "The following errors occurred during mass download:{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
+msgid "Errors during Download"
+msgstr "Feil under nedlasting"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#, java-format
+msgid ""
+"<html>There are {0} primitives in your local dataset which<br>might be "
+"deleted on the server. If you later try to delete or<br>update them the "
+"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
+msgstr ""
+"<html>Det er {0} elementer i det lokale datasettet som<br>kan være slettet "
+"på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere dem, vil "
+"tjeneren sannsynligvis rapportere om en<br>konflikt.<br><br>Trykk <strong>{1}"
+"</strong> for å sjekke status for disse elementene<br>på tjeneren.<br>Trykk "
+"<strong>{2}</strong> for å ignorere.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+msgid "Deleted or moved primitives"
+msgstr "Slettede eller flyttede objekter"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
+msgid "Delete Mode"
+msgstr "Slettemodus"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
+msgid "Delete nodes or ways."
+msgstr "Slett noder eller linjer."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
+#, java-format
+msgid "Mode: {0}"
+msgstr "Modus: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"Klikk for å slette. Shift: slett linjesegment. Alt: Ikke slett ubrukte noder "
+"når linjer slettes. Ctrl: slett objekt med referanse."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
@@ -2226,18 +2072,18 @@
 "+slipp synkroniserer audio i dette punktet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid "Select"
 msgstr "Velg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 msgid "Select, move and rotate objects"
 msgstr "Velg, flytt og roter objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2246,18 +2092,18 @@
 msgstr[1] "Legg til og flytt en kunstig node til {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
 msgid "Move elements"
 msgstr "Flytt elementer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Flytt dem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Angre flytting"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
+#, java-format
 msgid ""
 "You moved more than {0} elements. Moving a large number of elements is often "
@@ -2265,8 +2111,6 @@
 "Really move them?"
 msgstr ""
-"Du flyttet mere enn {0} elementer. Flytting av et stort antall elementer er "
-"ofte en feil."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
 msgid "Always move and don't show dialog again"
 msgstr ""
@@ -2390,7 +2234,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
-#, fuzzy
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr "<b>id:</b>… – objekt med angitt ID"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
@@ -2445,41 +2288,41 @@
 msgstr "Søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Start Search"
 msgstr "Start søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Fant ingen treff for «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
 #, java-format
 msgid "Found {0} matches"
 msgstr "Fant {0} treff"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
 #, java-format
 msgid ""
@@ -2492,41 +2335,41 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Uventet symbol: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530
 msgid "Missing arguments for or."
 msgstr "OR mangler argument."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540
 msgid "Missing argument for not."
 msgstr "NOT mangler argument."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550
 msgid "Expected closing parenthesis."
 msgstr "Forventer parentes slutt."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Feil antall parametere for nodes-operator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
 #, java-format
 msgid ""
@@ -2537,5 +2380,5 @@
 "intervall, for eksempel nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2572,62 +2415,62 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "Add node {0}"
-msgstr "Legg til node"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#, fuzzy, java-format
+#, java-format
 msgid "Add way {0}"
-msgstr "Legg til {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
-#, fuzzy, java-format
+#, java-format
 msgid "Add relation {0}"
-msgstr "Relasjoner: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Change node {0}"
-msgstr "Endre {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
-#, fuzzy, java-format
+#, java-format
 msgid "Change way {0}"
-msgstr "Endre {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
-#, fuzzy, java-format
+#, java-format
 msgid "Change relation {0}"
-msgstr "Skift relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr "Fjern «{0}» i {1} «{2}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr "Fjern «{0}» i {1} «{2}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr "Fjern «{0}» i {1} «{2}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr "Sett {0}={1} i {2} «{3}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr "Sett {0}={1} i {2} «{3}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr "Sett {0}={1} i {2} «{3}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
@@ -2699,30 +2542,30 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] "Slett {0} {1}"
-msgstr[1] "Slett {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] "Slettemodus"
-msgstr[1] "Slettemodus"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] "Slett {0} {1}"
-msgstr[1] "Slett {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} relation"
 msgid_plural "Delete {0} relations"
-msgstr[0] "Slett fra relasjon"
-msgstr[1] "Slett fra relasjon"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
@@ -2736,20 +2579,16 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
 "from relation?</html>"
 msgstr ""
-"Utvalg «{0}» brukes av relasjon «{1}» med rolle {2}.\n"
-"Vil du slette utvalget fra relasjonen?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
 "</html>"
 msgstr ""
-"Utvalg «{0}» brukes av relasjon «{1}».\n"
-"Vil du slette utvalget fra relasjonen?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446
@@ -2760,5 +2599,5 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2841,17 +2680,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr "Løs {0} egenskapskonflikter i {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr "Løs {0} egenskapskonflikter i {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr "Løs {0} egenskapskonflikter i {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
@@ -2861,17 +2700,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for node {0}"
-msgstr "Løs versjonskonflikter for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for way {0}"
-msgstr "Løs versjonskonflikter for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for relation {0}"
-msgstr "Løs versjonskonflikter for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
@@ -2961,11 +2800,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
 "isn't a directory."
 msgstr ""
-"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i "
-"historikken."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
@@ -3011,9 +2848,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
 "<br> and creating a new default preference file.</html>"
-msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
@@ -3080,5 +2917,5 @@
 msgstr "Ø"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
 #, java-format
@@ -3086,22 +2923,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parameter {0} > 0 nødvendig. Leste {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
+#, fuzzy, java-format
+msgid "paramete''{0}'' must not be null"
+msgstr "parameter «{0}» må ha en verdi"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
+#, fuzzy, java-format
+msgid "unsupported value ''{0}'' or parameter ''{1}''"
+msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
 #, java-format
 msgid "Error: {0}"
 msgstr "Feil: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
 #, java-format
 msgid "Warning: {0}"
 msgstr "Advarsel: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#, fuzzy, java-format
+msgid "expected id >= 0. Got {0}"
+msgstr "Uventet kolonneindeks: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#, fuzzy, java-format
+msgid "id > 0 expected. Got {0}"
+msgstr "Uventet symbol: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#, fuzzy, java-format
+msgid "version > 0 expected. Got {0}"
+msgstr "Uventet symbol: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
@@ -3115,11 +2977,16 @@
 msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:571
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
 "tag collection can't be applied to a primitive because there are keys with "
 "multiple values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
+msgid "can't add node {0} to incomplete way {1}"
 msgstr ""
 
@@ -3170,9 +3037,9 @@
 msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
 msgid "Area style way is not closed."
 msgstr "Linje for areal er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3181,118 +3048,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
 msgid "Empty member in relation."
 msgstr "Tomt medlem i relasjon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Slettet medlem «{0}» i relasjon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Linje «{0}» med færre enn to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Fant mer enn én linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Fant mer enn én linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Fant mer enn én \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukjent rolle «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukjent medlemstype for «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Fant ingen linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Fant ingen linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Fant ingen node eller linje med «via»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:660
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:673
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:677
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Fant ikke stil for restriksjon {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Multipolygon-medlem «{0}» er ikke en linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ingen ytre linje for multipolygon «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Skjæring mellom linjene «{0}» og «{1}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Indre linje «{0}» er utenfor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil for indre linje «{0}» er samme som multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil for ytre linje «{0}» passer ikke."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
 msgid "untagged"
 msgstr "Uten egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
 msgid "text"
 msgstr "tekst"
@@ -3318,5 +3185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3327,5 +3194,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3336,5 +3203,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3448,5 +3315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "railway"
 msgstr "jernbane"
@@ -3478,134 +3345,34 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
-"the server URL in your preferences and your internet connection.</html>"
-msgstr ""
-"Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n"
-"Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker."
-
-#. item "Ways/Cycleway" combo "Pedestrians"
-#. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-msgid "unknown"
-msgstr "ukjent"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#, java-format
-msgid ""
-"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-"changeset will automatically be closed by the server after a timeout.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
-#, java-format
-msgid ""
-"<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
-msgstr ""
-"<html>Opplasting til tjeneren <strong>feilet</strong> fordi nåværende "
-"datasett<br>bryter en forhåndsbetingelse.<br>Feilmelding:<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
 msgid "Precondition violation"
 msgstr "Forhåndsbetingelse brutt"
 
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+msgid "Security exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+msgid "Network exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+msgid "IO Exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+msgid "Internal Server Error"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-"security reasons. This is most likely because you are running<br>in an "
-"applet and because you didn''t load your applet from ''{1}''.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139
-msgid "Security exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
-"check your internet connection.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-msgid "Network exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179
-#, java-format
-msgid ""
-"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
-"problem with transferring data.<br>Details(untranslated): {1}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189
-msgid "IO Exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203
-#, java-format
-msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:213
-msgid "Internal Server Error"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
-"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
-"preferences and your internet connection.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245
+#, fuzzy
+msgid "Bad Request"
+msgstr "Rediger racquet"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "Unknown host"
 msgstr "Ukjent vert"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because a primitive you tried "
-"to<br>delete on the server is already deleted.<br><br>The error message is:"
-"<br>{0}</html>"
-msgstr ""
-"<html>Opplasting <strong>feilet</strong> fordi et element du prøvde "
-"å<br>slette allerede er slettet på tjeneren.<br><br>Feilmelding:<br>{0}</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231
 msgid "Primitive already deleted"
 msgstr "Objekt allerede slettet"
@@ -3824,5 +3591,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
 msgid "Menu: {0}"
@@ -4222,4 +3989,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
@@ -4295,8 +4064,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
@@ -4429,5 +4198,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63
 msgid "deleted"
 msgstr "slettet"
@@ -4487,10 +4256,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:197
 msgid "No, abort"
 msgstr "Nei, avbryt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -4498,7 +4267,4 @@
 "yo agree?</html>"
 msgstr ""
-"<html>For å beholde den lokale versjonen,<br>må JOSM sette ID for {0} {1} "
-"til 0.<br>Tjeneren gir elementet en ny ID neste<br>gang du laster det opp."
-"<br>Er dette OK?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590
@@ -4532,4 +4298,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
@@ -4543,5 +4310,5 @@
 msgstr "Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
@@ -4647,4 +4414,40 @@
 msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
+msgid "Conflicts when combining primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
+#, java-format
+msgid "Conflicts when combining ways - combined way is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
+#, java-format
+msgid "Conflicts when merging nodes - merged node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
+#, fuzzy
+msgid "No conflicts to resolve"
+msgstr "Ingen gjenværende egenskapskonflikter å løse"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgid "Cancel conflict resolution"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+msgid "Apply resolved conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+msgid "Apply"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
@@ -4657,24 +4460,23 @@
 msgstr "alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
 msgid "Choose a value"
-msgstr "Velg en farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
+#, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
 #, java-format
 msgid "The key ''{0}'' and all it's values are going to be removed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
@@ -4682,12 +4484,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
-#, fuzzy, java-format
+#, java-format
 msgid "parameter ''{0}'' must not be empty"
-msgstr "parameter «{0}» må ha en verdi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
-#, fuzzy, java-format
+#, java-format
 msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
@@ -4695,15 +4497,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
 msgid "not yet decided"
-msgstr "ikke slettet"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr "Ikke implementert enda."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
@@ -4712,17 +4514,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-#, fuzzy
 msgid "Tags from ways"
-msgstr "fra linje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-#, fuzzy
 msgid "Tags from relations"
-msgstr "Slett fra relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-#, fuzzy
 msgid "Conflicts in pasted tags"
-msgstr "Konflikter i data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
@@ -4746,24 +4545,8 @@
 msgstr[1] "{0} relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
-#, fuzzy
-msgid "Cancel conflict resolution"
-msgstr "Konfliktløsning"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
-#, fuzzy
-msgid "Apply resolved conflicts"
-msgstr "Løs konflikter"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-msgid "Apply"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
-#, fuzzy
 msgid "Paste ..."
-msgstr "Lim inn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
@@ -4778,9 +4561,75 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
-#, fuzzy, java-format
+#, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] "{0} linje"
-msgstr[1] "{0} linjer"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "pos {0} is out of range. current number of members: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#, fuzzy
+msgid "Remove this relation member from the relation"
+msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+#, fuzzy
+msgid "Replace"
+msgstr "sted"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#, fuzzy
+msgid "Undecided"
+msgstr "Fjern avgjørelse"
+
+#. --- role editing
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+msgid "Role:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
+msgid "Tag modified relations with   "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
+msgid "Key:"
+msgstr "Tast:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
+#, fuzzy
+msgid "Value:"
+msgstr "Verdi"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
+msgid "Apply this role to all members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
+msgid "Pos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
+#, fuzzy
+msgid "Orig. Way"
+msgstr "Enveiskjøring"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
+#, fuzzy
+msgid "Decision"
+msgstr "Revisjon"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4807,5 +4656,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 #, java-format
 msgid "Toggle: {0}"
@@ -4836,5 +4685,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -4907,13 +4756,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, fuzzy, java-format
+#, java-format
 msgid "Way {0}"
-msgstr "Lag: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, fuzzy, java-format
+#, java-format
 msgid "Relation {0}"
-msgstr "Relasjoner: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
@@ -4999,5 +4848,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
 msgid "<different>"
 msgstr "<different>"
@@ -5056,5 +4905,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
 msgstr "Legg til"
@@ -5104,5 +4953,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3109
 msgid "Relations"
 msgstr "Relasjoner"
@@ -5195,9 +5044,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] "Opphavsmann"
-msgstr[1] "Opphavsmann"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
@@ -5206,19 +5055,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
-#, fuzzy
 msgid "Show info"
-msgstr "Vis"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
-#, fuzzy
 msgid "Launches a browser with information about the user"
-msgstr "Mer informasjon om denne funksjonen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
-"ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208
@@ -5293,5 +5139,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5309,9 +5155,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
 msgid "Child Relations"
-msgstr ""
-
-#. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
-msgid "Role:"
 msgstr ""
 
@@ -5562,11 +5403,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
-#, java-format
-msgid "child.id >0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#, java-format
+msgid "child.getId() >0 expected. Got {1}"
 msgstr ""
 
@@ -5580,7 +5421,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
-#, fuzzy
 msgid "Loading parent relations"
-msgstr "Rediger relasjoner"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5706,5 +5546,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2747
 msgid "Places"
 msgstr "Steder"
@@ -5782,9 +5622,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
+#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
 "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Click."
-msgstr ""
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"Zoom: Musehjul eller dobbeltklik. Flyt kart: Hold høyre museknapp nede og "
+"flytt musa. Velg: Klik"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5814,17 +5657,17 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, fuzzy, java-format
+#, java-format
 msgid "History for node {0}"
-msgstr "Historikk for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, fuzzy, java-format
+#, java-format
 msgid "History for way {0}"
-msgstr "Historikk for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "History for relation {0}"
-msgstr "Historikk for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
@@ -5833,7 +5676,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#, fuzzy
 msgid "Reload the history from the server"
-msgstr "Vis historikken for det valgte objektet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
@@ -5870,22 +5712,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "id > 0 expected, got {0}"
-msgstr "parameter «{0}» > 0 forventet – leste «{1}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
-#, fuzzy, java-format
+#, java-format
 msgid "Loading history for node {0}"
-msgstr "Laster historikk for {0} med ID {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116
-#, fuzzy, java-format
+#, java-format
 msgid "Loading history for way {0}"
-msgstr "Laster historikk for {0} med ID {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Loading history for relation {0}"
-msgstr "Laster historikk for {0} med ID {1}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6720,78 +6562,74 @@
 #: build/trans_presets.java:2332 build/trans_presets.java:2338
 #: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2448 build/trans_presets.java:2455
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2489
-#: build/trans_presets.java:2495 build/trans_presets.java:2501
-#: build/trans_presets.java:2523 build/trans_presets.java:2530
-#: build/trans_presets.java:2537 build/trans_presets.java:2543
-#: build/trans_presets.java:2550 build/trans_presets.java:2556
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2587 build/trans_presets.java:2594
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2674
-#: build/trans_presets.java:2683 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2712
-#: build/trans_presets.java:2719 build/trans_presets.java:2739
-#: 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:2780
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: build/trans_presets.java:2828 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2897 build/trans_presets.java:2907
-#: build/trans_presets.java:2916 build/trans_presets.java:2922
-#: build/trans_presets.java:2928 build/trans_presets.java:2933
-#: build/trans_presets.java:2939 build/trans_presets.java:2945
-#: build/trans_presets.java:2954 build/trans_presets.java:2960
-#: build/trans_presets.java:2966 build/trans_presets.java:2972
-#: build/trans_presets.java:2978 build/trans_presets.java:2984
-#: build/trans_presets.java:2990 build/trans_presets.java:2997
-#: build/trans_presets.java:3003 build/trans_presets.java:3008
-#: build/trans_presets.java:3015 build/trans_presets.java:3022
-#: build/trans_presets.java:3028 build/trans_presets.java:3037
-#: build/trans_presets.java:3045 build/trans_presets.java:3051
-#: build/trans_presets.java:3057 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3089
-#: build/trans_presets.java:3095 build/trans_presets.java:3101
-#: build/trans_presets.java:3114 build/trans_presets.java:3128
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:2451 build/trans_presets.java:2458
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2485 build/trans_presets.java:2492
+#: build/trans_presets.java:2498 build/trans_presets.java:2504
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2553 build/trans_presets.java:2559
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2590 build/trans_presets.java:2597
+#: 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:2641 build/trans_presets.java:2648
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2677
+#: build/trans_presets.java:2686 build/trans_presets.java:2701
+#: build/trans_presets.java:2707 build/trans_presets.java:2715
+#: build/trans_presets.java:2722 build/trans_presets.java:2742
+#: build/trans_presets.java:2752 build/trans_presets.java:2758
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2783
+#: build/trans_presets.java:2790 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817 build/trans_presets.java:2824
+#: build/trans_presets.java:2831 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2851
+#: build/trans_presets.java:2858 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2885 build/trans_presets.java:2891
+#: build/trans_presets.java:2900 build/trans_presets.java:2910
+#: build/trans_presets.java:2919 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2948
+#: build/trans_presets.java:2957 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2987
+#: build/trans_presets.java:2993 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3018 build/trans_presets.java:3025
+#: build/trans_presets.java:3031 build/trans_presets.java:3040
+#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3080
+#: build/trans_presets.java:3086 build/trans_presets.java:3092
+#: build/trans_presets.java:3098 build/trans_presets.java:3104
+#: build/trans_presets.java:3117 build/trans_presets.java:3131
+#: build/trans_presets.java:3145
 msgid "Name"
 msgstr "Navn"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong> in changeset <strong>{3}</strong>"
-msgstr ""
-"<html>Versjon <strong>{0}</strong> lagt til <strong>{1}</strong> av <strong>"
-"{2}</strong></html>"
+"<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
-#, fuzzy
 msgid "Changeset info"
-msgstr "endringssett"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
-#, fuzzy
 msgid "Launch browser with information about the changeset"
-msgstr "Mer informasjon om denne funksjonen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
-#, fuzzy, java-format
+#, java-format
 msgid "Show changeset {0}"
-msgstr "Siste endring på {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
@@ -6809,7 +6647,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
-#, fuzzy
 msgid "Select filename"
-msgstr "Gatenavn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
@@ -6850,12 +6687,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
-#, fuzzy
 msgid "Please select a file"
-msgstr "Velg en verdi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
-#, fuzzy, java-format
+#, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr "parameter «{0}» må ha en verdi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102
@@ -6900,6 +6736,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
 #, fuzzy
-msgid "Unsafed data and conflicts"
-msgstr "Reparer konflikter i egenskaper."
+msgid "Unsaved data and conflicts"
+msgstr "Løs konflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
@@ -6916,5 +6752,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
-msgid "Unsafed data and missing associated file"
+msgid "Unsaved data and missing associated file"
 msgstr ""
 
@@ -6933,5 +6769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-msgid "Unsafed data non-writable files"
+msgid "Unsaved data non-writable files"
 msgstr ""
 
@@ -6945,7 +6781,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-#, fuzzy
 msgid "Discard and Delete"
-msgstr "Forkast og avslutt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
@@ -6958,7 +6793,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-#, fuzzy
 msgid "Save and Delete"
-msgstr "Lagre og avslutt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
@@ -7036,7 +6870,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
-#, fuzzy
 msgid "Should upload?"
-msgstr "Ved opplasting"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
@@ -7045,17 +6878,145 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
+msgid "Filename"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+msgid "Upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
+msgid "Use a new changeset and close it"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+msgid ""
+"Select to upload the data using a new changeset and to close the changeset "
+"after the upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+msgid "Use a new changeset and leave it open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+msgid ""
+"Select to upload the data using a new changeset and to leave the changeset "
+"open after the upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
+msgid "Upload to a new or to an existing changeset?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+msgid "upload all changes in one request"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Gi en kort kommentar for endringene du laster opp:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
+msgid "Settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+msgid "Tags of new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+msgid "Objects to add:"
+msgstr "Objekter som legges til:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+msgid "Objects to modify:"
+msgstr "Objekter som endres:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+msgid "Objects to delete:"
+msgstr "Objekter som slettes:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#, java-format
+msgid "{0} object to add:"
+msgid_plural "{0} objects to add:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#, java-format
+msgid "{0} object to modifiy:"
+msgid_plural "{0} objects to modify:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#, java-format
+msgid "{0} object to delete:"
+msgid_plural "{0} objects to delete:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
+#, java-format
+msgid "Use the existing changeset {0} and close it after upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to close the changeset "
+"after this upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
+#, java-format
+msgid "Use the existing changeset {0} and leave it open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to leave the changeset "
+"open for further uploads"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+msgid "Upload Changes"
+msgstr "Last opp endringer"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
 #, fuzzy
-msgid "Filename"
-msgstr "Fil"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+msgid "Upload the changed primitives"
+msgstr "Laste opp disse endringene?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
 #, fuzzy
-msgid "Upload"
-msgstr "Laster opp"
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr "Tast inn et navn for stedet."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+msgid "Cancel the upload and resume editing"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
-#, fuzzy
 msgid "Preparing primitives to upload ..."
-msgstr "Det er ingen valgte objekter å oppdatere"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7288,5 +7249,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7344,7 +7304,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
-#, fuzzy
 msgid "Download data"
-msgstr "Laster ned data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
@@ -7409,4 +7368,13 @@
 msgid "Convert to GPX layer"
 msgstr "Konvertér til GPX-lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#, fuzzy
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>Opplasting av ubehandlede GPS-data som kortdata betraktes som "
+"skadeligt <br>Se her for å laste inn GPS spor:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
@@ -7599,5 +7567,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
 msgstr "Velg raden som skal slettes"
@@ -8069,7 +8037,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
-#, fuzzy
 msgid "Show localized name in selection lists"
-msgstr "Vis objekt-ID i lister"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
@@ -8084,7 +8051,6 @@
 #. Show localized names
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89
-#, fuzzy
 msgid "Show localized name in selection lists, if available"
-msgstr "Vis objekt-ID i lister"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
@@ -8457,8 +8423,4 @@
 msgstr "Deaktiver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
-msgid "Key:"
-msgstr "Tast:"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
@@ -8515,5 +8477,5 @@
 msgstr "<multiple>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
 #, java-format
@@ -8524,42 +8486,40 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
-#, fuzzy
 msgid "Add a new tag"
-msgstr "Legg til nytt lag"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
-#, fuzzy
 msgid "Delete the selection in the tag table"
-msgstr "Slett valgt Lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
 msgid "More information about this feature"
 msgstr "Mer informasjon om denne funksjonen"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
 msgid "Optional Attributes:"
 msgstr "Valgfrie attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Bruk objektmal «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 msgid "closedway"
 msgstr "stengt_vei"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
@@ -8570,15 +8530,15 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:702
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8588,18 +8548,18 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Change Properties"
 msgstr "Endre egenskaper"
@@ -8626,5 +8586,4 @@
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, muligens fordi egenskaper mangler."
@@ -8640,7 +8599,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
 #, java-format
@@ -8718,5 +8674,5 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
 msgid "Markers from {0}"
@@ -8724,5 +8680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8730,5 +8686,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -8750,6 +8705,6 @@
 "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
@@ -8759,40 +8714,40 @@
 msgstr "Laster ned OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
+#, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
-msgstr "Rediger relasjon #{0} i lag \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr "Tjeneren svarte med HTTP 404 for ID {0} – hopper over."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
+#, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -8857,10 +8812,10 @@
 msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "Uventet ID-format i svar fra tjener – leste «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
 #, java-format
 msgid ""
@@ -8868,11 +8823,9 @@
 msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
 msgid "Creating changeset..."
-msgstr "Åpner endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
 #, java-format
 msgid "Successfully opened changeset {0}"
@@ -8880,34 +8833,18 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
-msgid "No currently open changeset. Opening a new changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
-msgid ""
-"Warning: could not reuse an existing changeset as requested. Opening a new "
-"one."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
-#, fuzzy, java-format
-msgid "Reusing existing changeset {0}"
-msgstr "Åpner endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336
-#, fuzzy
 msgid "Updating changeset..."
-msgstr "Åpner endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 #, java-format
 msgid "Changeset {0} is unchanged. Skipping update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#, java-format
 msgid "Updating changeset {0}..."
-msgstr "Åpner endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 msgid ""
 "Failed to update changeset. Either there is no current changeset or the id "
@@ -8915,44 +8852,44 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 msgid "Closing changeset..."
 msgstr "Lukker endringssett …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
+#, java-format
 msgid "Closing changeset {0}..."
-msgstr "Lukker endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+#, java-format
 msgid "Leaving changeset {0} open..."
-msgstr "Åpner endringssett …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
 msgid "No changeset present for diff upload"
 msgstr "Ingen base med rettinger tilstede for opplasting"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
 msgid "Preparing..."
 msgstr "Forbereder …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
 msgid "Uploading..."
 msgstr "Laster opp …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
 #, java-format
 msgid "Starting retry {0} of {1}."
@@ -8971,10 +8908,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17
 msgid "OSM Server Files bzip2 compressed"
 msgstr "OSM-tjenerfiler bzip2-komprimert"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29
 msgid "Invalid bz2 file."
 msgstr "Ugyldig bzip2-fil"
@@ -9037,6 +8974,11 @@
 "<br><b>Ikke bruk et verdifullt passord.</b></html>"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#, java-format
+msgid "(at line {0}, column {1})"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
 msgid "OSM Server Files"
 msgstr "OSM-tjenerfiler"
@@ -9065,5 +9007,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16
 msgid "OSM Server Files gzip compressed"
 msgstr "OSM-tjenerfiler gzip-komprimert"
@@ -9129,76 +9071,145 @@
 msgstr "Feil ved innlesing."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
-msgid "Unknown version"
-msgstr "Ukjent versjon"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
-msgid "Version number missing from OSM data"
-msgstr "Versjon nummer mangler i OSM data"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
-#, java-format
-msgid "Unknown version: {0}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
+#, fuzzy, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr "obligatorisk attributt «{0}» mangler"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
+#, fuzzy, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr "obligatorisk attributt «{0}» mangler"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#, fuzzy, java-format
+msgid "Unsupported version: {0}"
 msgstr "Ukjent versjon: {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+msgid "found XML element <nd> element not as direct child of element <way>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#, fuzzy, java-format
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgstr "obligatorisk attributt «{0}» mangler"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-msgid "Found <nd> element in non-way."
-msgstr "Fant <nd> element i ikke_linje."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
-msgid "<nd> has zero ref"
-msgstr "<nd> har zero ref"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
-msgid "Found <member> element in non-relation."
-msgstr "Fandt <member>-element i en ikke-relation."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
-#, java-format
-msgid "Missing attribute \"ref\" on member in relation {0}"
+#, fuzzy, java-format
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgstr ""
+"Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+msgid "Found XML element <member> not as direct child of element <relation>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#, fuzzy, java-format
+msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr "Mangler attributt «ref» for medlem av relasjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, java-format
-msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 "Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
-#, java-format
-msgid "Missing attribute \"type\" on member {0} in relation {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#, fuzzy, java-format
+msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr "Mangler attributt «type» for medlem {0} i relasjon {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218
-#, java-format
-msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#, fuzzy, java-format
+msgid ""
+"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
+msgstr ""
+"Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ufullstendig <member>-spesifikasjon med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#, java-format
+msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 msgid "Illegal object with id=0"
 msgstr "Ulovlig objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
-#, java-format
-msgid ""
-"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#, fuzzy, java-format
+msgid ""
+"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
 "Ugyldig verdi for attributt «version» for OSM-element med ID {0} – leste {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302
-#, java-format
-msgid "Missing attribute \"version\" on OSM primitive with id {0}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+"version is ''0.6''. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
+"version is ''0.5''. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+"version is ''0.5''. Got {1}"
+msgstr ""
+
+#. should not happen. API version has been checked before
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#, fuzzy, java-format
+msgid "Unknown or unsupported API version. Got {0}"
+msgstr "Ukjent versjon: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#, fuzzy, java-format
+msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr "Mangler attributt «version» for OSM-element med ID {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317
-#, java-format
-msgid "Missing required attribute \"{0}\"."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#, fuzzy, java-format
+msgid "Missing required attribute ''{0}''."
 msgstr "Mangler obligatorisk attributt «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#, fuzzy, java-format
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#, java-format
+msgid ""
+"way with external id ''{0}'' includes missing node with external id ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
 #, java-format
 msgid ""
@@ -9207,16 +9218,30 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#, java-format
+msgid ""
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, java-format
-msgid "Unknown relation member type {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
+#, fuzzy, java-format
+msgid ""
+"Relation with external id ''{0}'' refers to missing primitive with external "
+"id ''{1}''"
+msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Prepare OSM data..."
 msgstr "Klargjør OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
-msgid "Ill-formed node id"
-msgstr "Feil id for node"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
+#, fuzzy
+msgid "Parsing OSM data..."
+msgstr "Klargjør OSM-data …"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
+#, fuzzy
+msgid "Preparing data set..."
+msgstr "Klargjør data …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9262,33 +9287,43 @@
 "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+msgid "Starting to upload with one request per primitive ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+msgid "Starting to upload in one request ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
+#, fuzzy
+msgid "Uploading data ..."
+msgstr "Laster opp …"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgid ""
+"WARNING: no API version defined for data to upload. Falling back to version "
+"0.6"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
 #, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194
-#, fuzzy
-msgid "Starting to upload in one request ..."
-msgstr "Ingen endringer å laste opp. Finn frem data først."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197
-msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
@@ -9326,12 +9361,7 @@
 msgstr "Laster ned programtillegg {0} …"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
 msgid "Skip download"
 msgstr "Hopp over nedlasting"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr "JOSM versjon {0} er nødvendig for programtillegg {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
@@ -9343,4 +9373,9 @@
 msgstr "Hopp over nedlasting"
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "JOSM versjon {0} er nødvendig for programtillegg {1}."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
 #, java-format
@@ -9383,20 +9418,20 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 msgid "Disable plugin"
 msgstr "Fjern programtillegg"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+msgid "Keep plugin"
+msgstr "Behold programtillegg"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
-msgid "Keep plugin"
-msgstr "Behold programtillegg"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9406,5 +9441,9 @@
 "skrive over eksisterende."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+msgid "<html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
 #, java-format
 msgid ""
@@ -9412,10 +9451,10 @@
 msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "I følge nformasjon i tilleggsprogram, er {0} opphavsmann."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9423,9 +9462,9 @@
 "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
 msgid "Should the plugin be disabled?"
 msgstr "Skal programtillegget fjernes?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9435,13 +9474,13 @@
 "lese programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -9498,4 +9537,35 @@
 "{0}"
 
+#. item "Ways/Cycleway" combo "Pedestrians"
+#. item "Ways/Footway" combo "Bikes"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: build/trans_presets.java:323 build/trans_presets.java:324
+#: build/trans_presets.java:325 build/trans_presets.java:326
+#: build/trans_presets.java:327 build/trans_presets.java:328
+#: build/trans_presets.java:329 build/trans_presets.java:330
+#: build/trans_presets.java:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:449
+#: build/trans_presets.java:469 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_presets.java:773
+#: build/trans_presets.java:788 build/trans_presets.java:1330
+#: build/trans_presets.java:1397 build/trans_presets.java:1398
+#: build/trans_presets.java:1399 build/trans_presets.java:2442
+#: build/trans_presets.java:2443 build/trans_presets.java:2444
+msgid "unknown"
+msgstr "ukjent"
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
 #, java-format
@@ -9572,4 +9642,96 @@
 msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)"
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:32
+#, java-format
+msgid ""
+"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
+"the server URL in your preferences and your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47
+#, java-format
+msgid ""
+"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
+"changeset will automatically be closed by the server after a timeout.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62
+#, java-format
+msgid ""
+"<html>Uploading to the server <strong>failed</strong> because your "
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Opplasting til tjeneren <strong>feilet</strong> fordi nåværende "
+"datasett<br>bryter en forhåndsbetingelse.<br>Feilmelding:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
+"security reasons. This is most likely because you are running<br>in an "
+"applet and because you didn''t load your applet from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
+#, fuzzy
+msgid ""
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
+msgstr ""
+"Maksimal områdeavgrensing er 0.25, og din bestilling er for stor. Bestill "
+"mindre område eller bruk planet.osm"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
+#, java-format
+msgid "<br>Error message(untranslated): {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
+"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"preferences and your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because a primitive you tried "
+"to<br>delete on the server is already deleted.<br><br>The error message is:"
+"<br>{0}</html>"
+msgstr ""
+"<html>Opplasting <strong>feilet</strong> fordi et element du prøvde "
+"å<br>slette allerede er slettet på tjeneren.<br><br>Feilmelding:<br>{0}</"
+"html>"
+
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
 #, java-format
@@ -9639,5 +9801,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104
 #, java-format
 msgid ""
@@ -9646,5 +9808,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110
 #, java-format
 msgid ""
@@ -9653,5 +9815,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112
 #, java-format
 msgid ""
@@ -9660,5 +9822,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119
 #, java-format
 msgid ""
@@ -9667,5 +9829,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
 #, java-format
 msgid ""
@@ -9726,40 +9888,39 @@
 msgstr "Last opp sporlogger"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
 msgid "Visibility"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 msgid "Defines the visibility of your trace for other OSM users."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
-#, fuzzy
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
 msgstr ""
 
 #. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141
-#: build/trans_presets.java:3145
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3148
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
 msgid "Please enter Description about your trace."
 msgstr "Oppgi en beskrivelse av sporloggen."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 msgid "Tags (comma delimited)"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
 msgid "Please enter tags about your trace."
 msgstr "Oppgi egenskaper til sporet"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:193
 #, java-format
 msgid "Selected track: {0}"
@@ -9767,47 +9928,47 @@
 
 #. Set progress dialog to indeterminate while connecting
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:216
 msgid "Connecting..."
 msgstr "Kobler til …"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239
 msgid "Upload cancelled"
 msgstr "Opplastingen ble avsluttet"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249
 msgid "Error while uploading"
 msgstr "Feil under opplastingen"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
 msgid "GPX upload was successful"
 msgstr "GPX opplastingen var vellykket"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 msgid "Upload failed. Server returned the following message: "
 msgstr "Klarte ikke laste opp. Tjeneren gav følgende svar: "
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
 msgstr "Laster opp GPX spor: {0}% ({1} av {2})"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378
 msgid "No description provided. Please provide some description."
 msgstr "Ingen beskrivelse er gitt. Legg inn beskrivelse av sporet"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:381
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:403
 msgid "No GPX layer selected. Cannot upload a trace."
 msgstr "GPX lag er ikke valgt -> Ingen spor å laste opp."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:384
 msgid "No username provided."
 msgstr "Ingen Brukernavn er oppgitt."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:387
 msgid "No password provided."
 msgstr "Det er ikke oppgitt passord."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
 msgid "Uploading GPX Track"
 msgstr "GPX Spor lastes opp"
@@ -10025,5 +10186,5 @@
 msgstr "Bilder uten egenskaper"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
 msgid "Correlate images with GPX track"
 msgstr "Jevnfør bilder med GPX spor"
@@ -10037,13 +10198,13 @@
 msgstr "Automatisk forslag"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:591
 msgid "You should select a GPX track"
 msgstr "Du bør velge et GPX-spor"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592
 msgid "No selected GPX track"
 msgstr "Intgen GPX-spor er valgt"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:604
 #, java-format
 msgid ""
@@ -10054,9 +10215,9 @@
 "Forventet format: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605
 msgid "Invalid timezone"
 msgstr "Ugyldig tidssone"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:617
 #, java-format
 msgid ""
@@ -10067,65 +10228,65 @@
 "Forventet format: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618
 msgid "Invalid offset"
 msgstr "Ugyldig forskyvning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:661
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
 msgstr "Fant {0} treff av {1} i GPX spor {2}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:662
 msgid "GPX Track loaded"
 msgstr "GPX-spor er lagt inn"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:697
 msgid "The selected photos don't contain time information."
 msgstr "Valgte foto har ikke tidskode."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:698
 msgid "Photos don't contain time information"
 msgstr "Foto har ikke tidskode."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:732
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:733
 msgid "GPX Track has no time information"
 msgstr "GPX sporet har ikke tidskoder"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidssone: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:797
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Koplet {0} av {1} foto til GPX spor."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:800
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Tidsforskjell på {0} dager)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:807
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Forskyvning mellom spor og foto: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10135,13 +10296,13 @@
 "synkronisere bildene manuelt."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
 msgid "Default Values"
 msgstr "Standardverdier"
@@ -10179,5 +10340,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
@@ -10206,11 +10367,9 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Town/city {0} not found or not available\n"
 "or action canceled"
 msgstr ""
-"Fransk by/sted {0} ikke funnet eller tilgjengelig i WMS.\n"
-"Sjekk om det finnes på www.cadastre.gouv.fr"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -10226,13 +10385,13 @@
 msgstr "Velg fra …"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
 msgid "Cadastre"
 msgstr "Matrikkel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10245,13 +10404,13 @@
 "Vil du gjenopprette bruken av F11 til å laste ned bilder?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "Restore grab shortcut F11"
 msgstr "Gjenopprett F11-hurtigtast"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM avsluttes for at endringen skal tre i kraft."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
 #, java-format
 msgid ""
@@ -10372,9 +10531,9 @@
 "De eldste filene blir automatisk slettet når denne størrelsen overskrides"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
 msgid "Auto-tag source added:"
 msgstr "Automatisk egenskap: kilde er lagt inn:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
 msgid "Add \"source=...\" to elements?"
 msgstr "Legg inn kilde ( source=...) på element?"
@@ -10484,7 +10643,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177
-#, fuzzy
 msgid "Image cropping"
-msgstr "laster bilde …"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176
@@ -10530,7 +10688,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-#, fuzzy
 msgid "Set "
-msgstr "Velg"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -10618,5 +10775,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
 msgid "Blank Layer"
 msgstr "Blankt lag"
@@ -11563,18 +11720,18 @@
 msgstr "Ukendt status for feilrapport"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 msgid "Open Visible..."
 msgstr "Åpne synlige …"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
 msgid "Open only files that are visible in current view."
 msgstr "Åpne filer som er synlige i det nåværende synsfelt."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
 msgid "No view open - cannot determine boundaries!"
 msgstr "Ingen arbeidsområde åpnet – kan ikke finne avgrensing."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114
 #, java-format
 msgid "Unknown file extension: {0}"
@@ -11585,5 +11742,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:93
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -11592,9 +11749,9 @@
 "Fant ikke Firefox. Oppgi Firefox-programmet i siden for Kartinnstillinger."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "osmarender options"
 msgstr "osmarender-indstillinger"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
 msgid "Firefox executable"
 msgstr "Firefox-programfil"
@@ -11605,28 +11762,33 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#, fuzzy
+msgid "create new objects"
+msgstr "Lag ny node."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "change the selection"
 msgstr "bytt utvalg"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the viewport"
 msgstr "bytt arbeidsutsnitt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "confirm all Remote Control actions manually"
 msgstr "Bekreft alle Remote control handlinger manuelt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "Settings for the Remote Control plugin."
 msgstr "Remote Control tilleggsprogram innstillinger."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -11638,28 +11800,35 @@
 "fjernstyring av tilleggsprogrammet."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Permitted actions"
 msgstr "Tillatte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control er bedt om å laste data fra API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 #, java-format
 msgid "Request details: {0}"
 msgstr "Be om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Do you want to allow this?"
 msgstr "Vil du tillate dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
 msgid "Confirm Remote Control action"
 msgstr "Bekreft Remote Control handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#, fuzzy
+msgid "Remote Control has been asked to create a new node."
+msgstr "Remote Control er bedt om å laste data fra API."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control har bedt om data fra denne URL:"
@@ -12159,25 +12328,33 @@
 "oppstått."
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+msgid "Enter values for all conflicts."
+msgstr "Legg inn verdier for alle konflikter."
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+msgid "Solve Conflicts"
+msgstr "Løs konflikter"
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
 msgid "Fix tag conflicts"
 msgstr "Reparer konflikter i egenskaper."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
 msgid "Removed Element from Relations"
 msgstr "Fjernede Element fra Relasjoner"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
 msgid "Join Areas: Remove Short Ways"
 msgstr "Slå sammen arealer: fjern korte linjer"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
 msgid "Closed Way"
 msgstr "Lukket linje"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
 msgid "Remove tags from inner ways"
 msgstr "Fjern egenskaper fra indre linjer"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
 msgid "Join Areas Function"
 msgstr "Funksjon Slå sammen Areal"
@@ -12249,6 +12426,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 msgid "Validation errors"
 msgstr "Valideringsfeil"
@@ -12258,10 +12435,10 @@
 msgstr "Ingen valideringsfeil"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
 msgid "Grid"
 msgstr "Rutenett"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #, java-format
 msgid ""
@@ -12352,51 +12529,65 @@
 msgstr "Kjører datavalidering"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
 msgid "Data with errors. Upload anyway?"
 msgstr "Data med feil. Last opp uansett?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
 msgid "Open the validation window."
 msgstr "Åpne valideringsvindu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:89
 msgid "Zoom to problem"
 msgstr "Zoom til problem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
 msgid "Fix"
 msgstr "Korriger"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
 msgid "Fix the selected errors."
 msgstr "Korriger valgte feilmeldinger."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
 msgstr "Ignorer valgte feilmeldinger neste gang."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Whole group"
 msgstr "Hele gruppen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Single elements"
 msgstr "Enkelte element"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Nothing"
 msgstr "Intet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
 msgid "Ignore whole group or individual elements?"
 msgstr "Ignorer hele gruppen eller enkelte element?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:190
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
 msgid "Ignoring elements"
 msgstr "Ignorerer element"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
+msgid "Fixing errors ..."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
+#, java-format
+msgid "Fixing ({0}/{1}): ''{2}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
+#, fuzzy
+msgid "Updating map ..."
+msgstr "Laster opp …"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12422,16 +12613,12 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
-#, fuzzy
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
 msgstr ""
-"Denne testen undersøker om to veier, jernbaner eller vannveier krysser i "
-"samme lag, uten å være knyttet i knutepunkt."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
-#, fuzzy
 msgid "Crossing buildings"
-msgstr "Lag bygninger"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
@@ -12439,19 +12626,18 @@
 msgstr "Kryssende veier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
 msgid "Duplicated nodes"
 msgstr "Dobbelt-Noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
 msgid "Nodes at same position"
-msgstr "Noder med samme navn"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
 msgid "Confirmation"
 msgstr ""
@@ -12459,19 +12645,16 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
-#, fuzzy
 msgid "Duplicated ways"
-msgstr "Fordoble linje"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
-#, fuzzy
 msgid ""
 "This test checks that there are no ways with same tags and same node "
 "coordinates."
-msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
-#, fuzzy
 msgid "Delete duplicate ways"
-msgstr "Opprett kopi av linje"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -13042,5 +13225,5 @@
 msgstr "Nådde et kryss"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Det oppsto en feil"
@@ -13147,5 +13330,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200
 msgid ""
 "Couldn't match the entered link or id to the selected service. Please try "
@@ -13153,5 +13336,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201
 msgid "No valid WMS URL or id"
 msgstr "Ingen gyldig WMS-URL eller ID"
@@ -13169,17 +13352,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
 msgid "No layers to adjust"
 msgstr ""
@@ -13222,19 +13405,18 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
-#, fuzzy
 msgid "(deactivated)"
-msgstr "brukertype"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS lag ({0}) laster automatisk ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS lag ({0})  laster ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
 #, java-format
 msgid ""
@@ -13245,116 +13427,126 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194
-#, fuzzy
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
 msgid "Invalid URL?"
-msgstr "Ugyldig dato"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
 msgid "File Format Error"
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åpne tomt WMS lag til data fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 msgid "WMS Plugin Preferences"
 msgstr "Innstillinger WMS Programtillegg"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Rediger liste over WMS-tjenere som vises i WMS-programtillegg"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Menu Name"
 msgstr "Meny Navn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
 msgid "Menu Name (Default)"
 msgstr "Meny Navn (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
 msgid "Enter a menu name and WMS URL"
 msgstr "Gi meny navn og WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
-#, fuzzy
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
 msgid "Copy Selected Default(s)"
-msgstr "Kopier Standard"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
-#, fuzzy
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
 msgid "Please select at least one row to copy."
-msgstr "Velg minst én linje"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
 msgid "Downloader:"
 msgstr "Nedlaster:"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Overlapp kartbilder"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#, fuzzy
+msgid "% of east:"
+msgstr "% av bredden:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#, fuzzy
+msgid "% of north:"
+msgstr "% av bredden:"
+
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
-#, fuzzy
 msgid "WMS Files (*.wms)"
-msgstr "TCX filer (*.tcx)"
+msgstr ""
 
 #. *
@@ -13753,5 +13945,5 @@
 #: build/trans_presets.java:120 build/trans_presets.java:140
 #: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3143
+#: build/trans_presets.java:1557 build/trans_presets.java:3146
 msgid "Reference"
 msgstr "Veinummer"
@@ -14293,7 +14485,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "asphalt"
-msgstr "Feriehytter"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14314,8 +14505,7 @@
 #: build/trans_presets.java:471 build/trans_presets.java:490
 #: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
-#, fuzzy
+#: build/trans_presets.java:1306 build/trans_presets.java:2434
 msgid "metal"
-msgstr "Bilutleie"
+msgstr ""
 
 #. color heath
@@ -14333,5 +14523,6 @@
 #: build/trans_presets.java:471 build/trans_presets.java:490
 #: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_style.java:3367
+#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_style.java:3367
 msgid "wood"
 msgstr "skogsområde"
@@ -14344,7 +14535,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "paving_stones"
-msgstr "parkeringsbillett"
+msgstr ""
 
 #. item "Ways/Track Grade 2" combo "Surface"
@@ -14380,7 +14570,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "pebblestone"
-msgstr "brostein"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14391,7 +14580,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "compacted"
-msgstr "uferdig"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14402,7 +14590,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "grass_paver"
-msgstr "gress"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14596,4 +14783,5 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Amenities/Toilets" combo "Fee"
+#. item "Amenities/Bench" combo "Backrest"
 #. item "Amenities/Hunting Stand" combo "Shelter"
 #. item "Amenities/Hunting Stand" combo "Hide"
@@ -14622,12 +14810,12 @@
 #: build/trans_presets.java:1398 build/trans_presets.java:1399
 #: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2397 build/trans_presets.java:2433
+#: build/trans_presets.java:2442 build/trans_presets.java:2443
+#: build/trans_presets.java:2444 build/trans_presets.java:2714
 msgid "yes"
 msgstr "ja"
 
 #. color permissive
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -14675,5 +14863,5 @@
 
 #. color private
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -14710,5 +14898,5 @@
 #. <rule>
 #. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -14772,6 +14960,7 @@
 #: build/trans_presets.java:1399 build/trans_presets.java:1763
 #: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2439 build/trans_presets.java:2440
-#: build/trans_presets.java:2441 build/trans_presets.java:2711
+#: build/trans_presets.java:2433 build/trans_presets.java:2442
+#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:2714
 msgid "no"
 msgstr "nei"
@@ -14917,6 +15106,6 @@
 #: build/trans_presets.java:788 build/trans_presets.java:1135
 #: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2898 build/trans_presets.java:2908
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2901 build/trans_presets.java:2911
+#: build/trans_presets.java:2920
 msgid "Type"
 msgstr "Type"
@@ -15187,7 +15376,6 @@
 #. item "Ways/Cycleway" check "Embankment"
 #: build/trans_presets.java:449
-#, fuzzy
 msgid "Pedestrians"
-msgstr "Gågate"
+msgstr ""
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -15206,7 +15394,6 @@
 #. item "Ways/Footway" check "Embankment"
 #: build/trans_presets.java:469
-#, fuzzy
 msgid "Bikes"
-msgstr "Pigghinder"
+msgstr ""
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -15498,7 +15685,7 @@
 #: build/trans_presets.java:2384 build/trans_presets.java:2395
 #: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2461 build/trans_presets.java:2509
-#: build/trans_presets.java:2675 build/trans_presets.java:2690
-#: build/trans_presets.java:2729 build/trans_presets.java:3148
+#: build/trans_presets.java:2464 build/trans_presets.java:2512
+#: build/trans_presets.java:2678 build/trans_presets.java:2693
+#: build/trans_presets.java:2732 build/trans_presets.java:3151
 msgid "Operator"
 msgstr "Operatør"
@@ -15711,6 +15898,6 @@
 #. item "Places/Volcano" text "Name"
 #: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2842
-#: build/trans_presets.java:2849 build/trans_presets.java:2856
+#: build/trans_presets.java:1745 build/trans_presets.java:2845
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
 msgid "Elevation"
 msgstr "Høyde"
@@ -16622,7 +16809,4 @@
 #. item "Sport Facilities/Miniature Golf" text "Name"
 #. item "Buildings/Library" text "Name"
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
-#. <key key="amenity" value="bench" />
 #. item "Amenities/Baby Hatch" text "Operator"
 #. item "Shops/Supermarket" text "Name"
@@ -16670,23 +16854,23 @@
 #: build/trans_presets.java:1818 build/trans_presets.java:1909
 #: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2433
-#: build/trans_presets.java:2462 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2250 build/trans_presets.java:2465
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: 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:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -16710,5 +16894,4 @@
 #. item "Buildings/Library" combo "Opening Hours"
 #. item "Buildings/Place of Worship" combo "Opening Hours"
-#. item "Amenities/Bench" combo "Opening Hours"
 #. item "Shops/Supermarket" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
@@ -16755,22 +16938,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: 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:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "24/7"
 msgstr ""
@@ -16785,22 +16968,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: 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:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -16815,22 +16998,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: 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:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16864,5 +17047,5 @@
 #: build/trans_presets.java:1391 build/trans_presets.java:1762
 #: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Reference number"
 msgstr "Referansenummer"
@@ -16882,7 +17065,6 @@
 
 #: build/trans_presets.java:1393
-#, fuzzy
 msgid "Park and Ride"
-msgstr "Innfartsparkering"
+msgstr ""
 
 #. item "Tourism/Information Terminal" text "Reference number"
@@ -16896,7 +17078,6 @@
 #. <space />
 #: build/trans_presets.java:1396
-#, fuzzy
 msgid "Capacity (overall)"
-msgstr "Kapasitet"
+msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
@@ -16906,12 +17087,10 @@
 
 #: build/trans_presets.java:1398
-#, fuzzy
 msgid "Spaces for Women"
-msgstr "Handicap-plasser"
+msgstr ""
 
 #: build/trans_presets.java:1399
-#, fuzzy
 msgid "Spaces for Parents"
-msgstr "Handicap-plasser"
+msgstr ""
 
 #: build/trans_presets.java:1400
@@ -17113,5 +17292,5 @@
 #. <separator/>
 #: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2442
 msgid "Shelter"
 msgstr "Leskur / Ly for natten"
@@ -17496,7 +17675,6 @@
 #. item "Tourism/Map" combo "Detail Grade"
 #: build/trans_presets.java:1720
-#, fuzzy
 msgid "topo"
-msgstr "Full stopp"
+msgstr ""
 
 #. color tertiary
@@ -17539,28 +17717,23 @@
 
 #: build/trans_presets.java:1720
-#, fuzzy
 msgid "scheme"
-msgstr "kinesisk"
+msgstr ""
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "Shown Area"
-msgstr "Last ned område"
+msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "site"
-msgstr "Lim inn"
+msgstr ""
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "city"
-msgstr "Storby"
+msgstr ""
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "region"
-msgstr "lokal"
+msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -17588,7 +17761,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #: build/trans_presets.java:1727 build/trans_presets.java:1750
-#, fuzzy
 msgid "Mountainbiking"
-msgstr "Fjellsti"
+msgstr ""
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -17602,7 +17774,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #: build/trans_presets.java:1729 build/trans_presets.java:1752
-#, fuzzy
 msgid "Riding"
-msgstr "Sidespor"
+msgstr ""
 
 #. item "Tourism/Map" check "Riding"
@@ -17619,13 +17790,11 @@
 #. item "Tourism/Information Board" text "Name"
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "Board Content"
-msgstr "Tollstasjon"
+msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "notice"
-msgstr "begynner"
+msgstr ""
 
 #: build/trans_presets.java:1737
@@ -17642,31 +17811,26 @@
 
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "plants"
-msgstr "bruk av grunn"
+msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1740
-#, fuzzy
 msgid "Guidepost"
-msgstr "Veiviser (turvei)"
+msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
 #: build/trans_presets.java:1755
-#, fuzzy
 msgid "Information Terminal"
-msgstr "Informasjon"
+msgstr ""
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
 #: build/trans_presets.java:1760 build/trans_presets.java:1770
-#, fuzzy
 msgid "Closer description"
-msgstr "Nærmere forklaring"
+msgstr ""
 
 #: build/trans_presets.java:1765
-#, fuzzy
 msgid "Audioguide"
-msgstr "Audio"
+msgstr ""
 
 #. <space />
@@ -17677,7 +17841,6 @@
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
 #: build/trans_presets.java:1776
-#, fuzzy
 msgid "Phone number"
-msgstr "Telefonnummer"
+msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
@@ -18001,5 +18164,5 @@
 #. <condition k="sport" v="dog_racing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="leisure/dog.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18033,5 +18196,5 @@
 #. <condition k="sport" v="gymnastics"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/multi.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19157,6 +19320,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "Religion"
 msgstr "Religion"
@@ -19165,66 +19328,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -19233,76 +19396,76 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "sunni"
 msgstr "sunni"
@@ -19634,5 +19797,5 @@
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2511
+#: build/trans_presets.java:2398 build/trans_presets.java:2514
 msgid "Note"
 msgstr "Kommentar"
@@ -19657,5 +19820,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2512
+#: build/trans_presets.java:2411 build/trans_presets.java:2515
 msgid "Coins"
 msgstr "Mynter"
@@ -19663,5 +19826,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2513
+#: build/trans_presets.java:2412 build/trans_presets.java:2516
 msgid "Notes"
 msgstr "Sedler"
@@ -19669,5 +19832,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2514
+#: build/trans_presets.java:2413 build/trans_presets.java:2517
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -19675,5 +19838,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2515
+#: build/trans_presets.java:2414 build/trans_presets.java:2518
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -19681,5 +19844,5 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2516
+#: build/trans_presets.java:2415 build/trans_presets.java:2519
 msgid "Credit cards"
 msgstr "Kredittkort"
@@ -19738,10 +19901,144 @@
 msgstr "Benk"
 
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#: build/trans_presets.java:2433
+#, fuzzy
+msgid "Backrest"
+msgstr "Tilbake"
+
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Material"
+msgstr "Minneplatte"
+
+#. item "Amenities/Bench" combo "Material"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "stone"
+msgstr "ingen"
+
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "plastic"
+msgstr "sted"
+
 #: build/trans_presets.java:2435
+#, fuzzy
+msgid "Colour"
+msgstr "Farge"
+
+#. item "Amenities/Bench" combo "Colour"
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "black"
+msgstr "Tilbake"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "brown"
+msgstr "ned"
+
+#. color historic
+#. <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 forest
+#. <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 cemetery
+#. <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"/>
+#: build/trans_presets.java:2435 build/trans_style.java:3055
+#: build/trans_style.java:3063 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3127
+#: build/trans_style.java:3135 build/trans_style.java:3233
+#: build/trans_style.java:3241
+msgid "green"
+msgstr "grønn"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "red"
+msgstr "avslutt"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "blue"
+msgstr "Verdi"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "white"
+msgstr "vann"
+
+#: build/trans_presets.java:2436
+#, fuzzy
+msgid "Amount of Seats"
+msgstr "Antall ledere"
+
+#. item "Amenities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2438
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -19750,30 +20047,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2438 build/trans_presets.java:2899
+#: build/trans_presets.java:2441 build/trans_presets.java:2902
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2446
 msgid "Fountain"
 msgstr "Fontene"
@@ -19782,10 +20079,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -19794,10 +20091,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2456
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Baby Hatch"
 msgstr "Stellebord"
@@ -19805,35 +20102,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2462
 msgid "Edit Baby Hatch"
 msgstr "Rediger stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2468
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2469
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
-#: build/trans_presets.java:2472
-#, fuzzy
+#: build/trans_presets.java:2475
 msgid "Chemist"
-msgstr "Feriehytter"
-
-#. item
-#: build/trans_presets.java:2473
-#, fuzzy
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2476
 msgid "Edit Chemist"
-msgstr "Rediger feriehytter"
-
-#: build/trans_presets.java:2478
+msgstr ""
+
+#: build/trans_presets.java:2481
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -19841,9 +20136,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2483
 msgid "Edit Convenience Store"
 msgstr "Rediger Minimarked"
 
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2488
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -19851,29 +20146,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2490
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2495
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2493
-#, fuzzy
+#: build/trans_presets.java:2496
 msgid "Edit Book Store"
-msgstr "Rediger bussholdeplass"
-
-#: build/trans_presets.java:2498
+msgstr ""
+
+#: build/trans_presets.java:2501
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2499
-#, fuzzy
+#: build/trans_presets.java:2502
 msgid "Edit Travel Agency"
-msgstr "Rediger tre"
-
-#: build/trans_presets.java:2504
+msgstr ""
+
+#: build/trans_presets.java:2507
 msgid "Vending machine"
 msgstr "Automat"
@@ -19881,5 +20174,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -19887,88 +20180,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "photos"
 msgstr "foto"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "stamps"
 msgstr "frimerke"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "vouchers"
 msgstr "sedler"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2520
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2522
 msgid "Butcher"
 msgstr "Slakter"
@@ -19976,9 +20269,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2524
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2529
 msgid "Baker"
 msgstr "Baker"
@@ -19986,9 +20279,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2531
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2536
 msgid "Florist"
 msgstr "Blomster"
@@ -19996,18 +20289,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2538
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2543
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2544
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2549
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -20015,54 +20308,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2551
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
-#: build/trans_presets.java:2553
+#: build/trans_presets.java:2556
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2557
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2562
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2563
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2569
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2574
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2575
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2580
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2581
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -20070,9 +20363,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2588
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
 
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2593
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -20080,9 +20373,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2595
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -20090,54 +20383,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2602
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2608
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2614
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Shoes"
 msgstr "Sko"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2620
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Toys"
 msgstr "Leker"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2626
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2631
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2632
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2637
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -20145,9 +20438,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2639
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2644
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -20155,9 +20448,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2646
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2651
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -20165,32 +20458,32 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2653
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2658
 msgid "Sports"
 msgstr "Sport"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2659
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2664
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2665
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2672
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2673
 msgid "Bank"
 msgstr "Bank"
@@ -20198,14 +20491,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2675
 msgid "Edit Bank"
 msgstr "Rediger bank"
 
-#: build/trans_presets.java:2677 build/trans_presets.java:2686
+#: build/trans_presets.java:2680 build/trans_presets.java:2689
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2682
 msgid "Money Exchange"
 msgstr "Veksle valuta"
@@ -20213,5 +20506,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2684
 msgid "Edit Money Exchange"
 msgstr "Rediger valutaveksling"
@@ -20219,15 +20512,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2691
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2696
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2697
 msgid "Doctors"
 msgstr "Lege"
@@ -20235,18 +20528,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2699
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2704
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2705
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2710
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -20254,5 +20547,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2712
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -20260,9 +20553,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2714
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2718
 msgid "Hospital"
 msgstr "Sykehus"
@@ -20270,10 +20563,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2720
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2724
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -20282,5 +20575,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2727
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -20289,20 +20582,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2730
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2731
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2733
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2734
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -20310,5 +20603,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2737
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -20317,55 +20610,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2740
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
 #. group "Places"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2748
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2749
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2754
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2755
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2760
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2761
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2766
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:2767
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2772
 msgid "County"
 msgstr "Kommune"
 
 #. item
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2773
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -20373,15 +20666,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2779
 msgid "City"
 msgstr "Storby"
 
 #. item
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2780
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2785
 msgid "Town"
 msgstr "By"
@@ -20389,10 +20682,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2787
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2792
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -20400,25 +20693,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2794
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2799
 msgid "Village"
 msgstr "Landsby"
 
 #. item
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2800
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2805
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2806
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -20426,5 +20719,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2812
 msgid "Locality"
 msgstr "Lokalitet"
@@ -20432,10 +20725,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2814
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2819
 msgid "Island"
 msgstr "Øy"
@@ -20443,24 +20736,22 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2821
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2823
-#, fuzzy
+#: build/trans_presets.java:2826
 msgid "Islet"
-msgstr "venstre"
+msgstr ""
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2825
-#, fuzzy
+#: build/trans_presets.java:2828
 msgid "Edit Islet"
-msgstr "Rediger feriehytter"
+msgstr ""
 
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2834
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -20468,10 +20759,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2836
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2840
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -20479,10 +20770,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2842
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2847
 msgid "Glacier"
 msgstr "Isbre"
@@ -20490,10 +20781,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2849
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2854
 msgid "Volcano"
 msgstr "Vulkan"
@@ -20501,70 +20792,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2856
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2862
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2863
 msgid "National"
 msgstr "Nasjonal"
 
 #. item
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2864
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2869
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2870
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2875
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2876
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2881
 msgid "Political"
 msgstr "Politisk"
 
 #. item
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2882
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2887
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2888
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2894
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2895
 msgid "Tree"
 msgstr "Tre"
@@ -20573,15 +20864,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2898
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2903
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2905
 msgid "Wood"
 msgstr "Skogsområde"
@@ -20590,5 +20881,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2908
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -20596,17 +20887,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2913
 msgid "Forest"
 msgstr "Skog"
@@ -20615,14 +20906,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2916
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2922
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2923
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -20630,25 +20921,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2928
 msgid "Scree"
 msgstr "Steinur"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2929
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2933
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2934
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2938
 msgid "Fell"
 msgstr "Fjell"
@@ -20656,10 +20947,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2940
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2944
 msgid "Heath"
 msgstr "Beite"
@@ -20667,5 +20958,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2946
 msgid "Edit Heath"
 msgstr "Rediger beite"
@@ -20673,5 +20964,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2951
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -20680,45 +20971,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2954
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2959
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2960
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2965
 msgid "Meadow"
 msgstr "Eng"
 
 #. item
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2966
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2971
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2972
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2977
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2978
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -20726,25 +21017,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2984
 msgid "Garden"
 msgstr "Hage"
 
 #. item
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2985
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2989
 msgid "Grass"
 msgstr "Gress"
 
 #. item
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2990
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2995
 msgid "Village Green"
 msgstr "Friområde"
@@ -20752,10 +21043,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:2997
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3002
 msgid "Common"
 msgstr "Offentlig"
@@ -20763,20 +21054,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3004
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3008
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3009
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3013
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -20784,5 +21075,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:3015
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -20790,15 +21081,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3021
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3022
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3027
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -20806,9 +21097,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3029
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3035
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -20816,39 +21107,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3037
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3044
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3045
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3050
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3051
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3056
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3057
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3062
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -20856,15 +21147,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3064
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3069
 msgid "Military"
 msgstr "Millitært"
 
 #. item
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3070
 msgid "Edit Military Landuse"
 msgstr "Rediger millitært"
@@ -20872,55 +21163,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3076
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3077
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3082
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3083
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3088
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3089
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3094
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3095
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3100
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3101
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
 
 #. group "Relations"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3110
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20930,5 +21221,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3114
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -20937,10 +21228,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3120
 msgid "outer segment"
 msgstr "ytre linjesegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3121
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -20948,5 +21239,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3124
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -20955,5 +21246,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3127
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -20961,34 +21252,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -20997,15 +21288,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3134
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3135
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3136
 msgid "to way"
 msgstr "til linje"
@@ -21013,5 +21304,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3139
 msgid "Route"
 msgstr "Rute"
@@ -21020,5 +21311,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3142
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -21026,5 +21317,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "Route type"
 msgstr "Rutetype"
@@ -21032,5 +21323,5 @@
 #. item "Relations/Route" combo "Route type"
 #. color destination
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -21096,5 +21387,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3141 build/trans_style.java:233
+#: build/trans_presets.java:3144 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21103,17 +21394,17 @@
 msgstr "sykkel"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "ski"
 msgstr "ski"
@@ -21166,5 +21457,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3141 build/trans_style.java:247
+#: build/trans_presets.java:3144 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21173,13 +21464,13 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "hiking"
 msgstr "tur"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "detour"
 msgstr "omkjøring"
@@ -21193,10 +21484,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3141 build/trans_style.java:1206
+#: build/trans_presets.java:3144 build/trans_style.java:1206
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3147
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -21204,31 +21495,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3150
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3153
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -21237,30 +21528,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3156
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3157
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3158
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3159
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3160
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3161
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -24413,76 +24704,4 @@
 msgstr "historisk"
 
-#. color historic
-#. <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 forest
-#. <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 cemetery
-#. <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"/>
-#: build/trans_style.java:3055 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3127 build/trans_style.java:3135
-#: build/trans_style.java:3233 build/trans_style.java:3241
-msgid "green"
-msgstr "grønn"
-
 #. color green
 #. <icon annotate="true" src="shop/groceries/fruits.png"/>
@@ -25450,9 +25669,73 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling."
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#. only for Czech Republic
+#: build/trans_wms.java:25
+msgid "Czech CUZK:KM"
+msgstr ""
+
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:26
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Alle linjene var tomme"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Samle noder med forskjellige relasjoner?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Samle noder allikevel"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles "
+#~ "samle noder?"
+
+#~ msgid "Unknown version"
+#~ msgstr "Ukjent versjon"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Versjon nummer mangler i OSM data"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Fant <nd> element i ikke_linje."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> har zero ref"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Fandt <member>-element i en ikke-relation."
+
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Feil id for node"
+
+#~ msgid "Move"
+#~ msgstr "Flytt"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Noen av nodene er (nesten) på linje"
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A> ellerr <A HREF="
+#~ "\"{1}\">norsk bokmål</A>."
+
+#~ msgid "unnamed"
+#~ msgstr "uten navn"
 
 #~ msgid ""
@@ -25466,95 +25749,4 @@
 #~ msgstr "Ingen åpne dokument å lagre"
 
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Slett {1} {0}"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Fjern relasjonsmedlem {0} {1}"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Kan ikke åpne innstillingsmappe: {0}"
-
-#~ msgid "nodes"
-#~ msgstr "noder"
-
-#~ msgid "ways"
-#~ msgstr "linjer"
-
-#~ msgid "relations"
-#~ msgstr "relasjoner"
-
-#~ msgid "changesets"
-#~ msgstr "endringssett"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Klarte ikke laste historikk fra tjeneren. Detaljer:<br>{0}</html>"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Slett Lag"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Opphavsmenn: {0}"
-
-#~ msgid "Public"
-#~ msgstr "Offentlig"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr ""
-#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på "
-#~ "openstreetmap.org"
-
-#~ 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 "Continue anyway"
-#~ msgstr "Fortsett uansett"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Rediger turistinformasjon"
-
-#~ msgid "Map Type"
-#~ msgstr "Karttype"
-
-#~ msgid "map"
-#~ msgstr "kart"
-
-#~ msgid "citymap"
-#~ msgstr "bykart"
-
-#~ msgid "hikingmap"
-#~ msgstr "turkart"
-
-#~ msgid "bicyclemap"
-#~ msgstr "sykkelkart"
-
-#~ msgid "Board Type"
-#~ msgstr "Tavletype"
-
-#~ msgid "board"
-#~ msgstr "infotavle"
-
-#~ msgid "Move"
-#~ msgstr "Flytt"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Noen av nodene er (nesten) på linje"
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A> ellerr <A HREF="
-#~ "\"{1}\">norsk bokmål</A>."
-
-#~ msgid "unnamed"
-#~ msgstr "uten navn"
-
 #~ msgid "Unknown file extension."
 #~ msgstr "Ukjent filtype."
@@ -25585,4 +25777,7 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{0} konflikter må løses i {1} objecter"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Slett {1} {0}"
 
 #~ msgid "Rotate"
@@ -25643,4 +25838,7 @@
 #~ msgstr "Konflikter: {0}"
 
+#~ msgid "Delete Layer"
+#~ msgstr "Slett Lag"
+
 #~ msgid "Layers: {0}"
 #~ msgstr "Lag: {0}"
@@ -25676,13 +25874,6 @@
 #~ msgstr "Relasjons-editor: {0}"
 
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: Musehjul eller dobbeltklik. Flyt kart: Hold høyre museknapp nede og "
-#~ "flytt musa. Velg: Klik"
+#~ msgid "Authors: {0}"
+#~ msgstr "Opphavsmenn: {0}"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -25710,4 +25901,7 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Slett og last ned"
+
+#~ msgid "Public"
+#~ msgstr "Offentlig"
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -25772,4 +25966,9 @@
 #~ msgstr "Feil ved sletting av programtillegg: {0}"
 
+#~ msgid "Selected makes your trace public in openstreetmap.org"
+#~ msgstr ""
+#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på "
+#~ "openstreetmap.org"
+
 #~ msgid ""
 #~ "An error occured while trying to match the photos to the GPX track. You "
@@ -25799,9 +25998,12 @@
 #~ "Lambert sone {0} i mellomlager  stemmer ikke med aktiv Lambert sone {1}"
 
-#~ msgid "end"
-#~ msgstr "avslutt"
-
 #~ msgid "Import TCX file as GPS track"
 #~ msgstr "Importer TCX fil som GPS spor"
+
+#~ msgid "Continue anyway"
+#~ msgstr "Fortsett uansett"
+
+#~ 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 "No intersections found. Nothing was changed."
@@ -25883,4 +26085,7 @@
 #~ msgstr "Last inn TCX filer direkte fra JOSM."
 
+#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling."
+
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
@@ -25893,4 +26098,22 @@
 #~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n"
 
+#~ msgid "Map Type"
+#~ msgstr "Karttype"
+
+#~ msgid "citymap"
+#~ msgstr "bykart"
+
+#~ msgid "hikingmap"
+#~ msgstr "turkart"
+
+#~ msgid "map"
+#~ msgstr "kart"
+
+#~ msgid "bicyclemap"
+#~ msgstr "sykkelkart"
+
+#~ msgid "board"
+#~ msgstr "infotavle"
+
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
@@ -25899,10 +26122,4 @@
 #~ msgstr "koblet"
 
-#~ msgid "Overlap tiles"
-#~ msgstr "Overlapp kartbilder"
-
-#~ msgid "% of lat:"
-#~ msgstr "% av bredden:"
-
 #~ msgid "% of lon:"
 #~ msgstr "% av lengden:"
@@ -25914,4 +26131,16 @@
 #~ msgstr "Datalag"
 
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Kan ikke åpne innstillingsmappe: {0}"
+
+#~ msgid "nodes"
+#~ msgstr "noder"
+
+#~ msgid "relations"
+#~ msgstr "relasjoner"
+
+#~ msgid "ways"
+#~ msgstr "linjer"
+
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Kontakter OSM-tjeneren …"
@@ -25926,4 +26155,8 @@
 #~ msgstr "Mangler objekt"
 
+#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+#~ msgstr ""
+#~ "<html>Klarte ikke laste historikk fra tjeneren. Detaljer:<br>{0}</html>"
+
 #~ msgid "Aborting..."
 #~ msgstr "Avbryter …"
@@ -25931,4 +26164,7 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "Importer TCX-fil …"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren."
 
 #~ msgid "Error parsing server response."
@@ -25950,4 +26186,10 @@
 #~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://"
 #~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
+
+#~ msgid "Edit Information Office"
+#~ msgstr "Rediger turistinformasjon"
+
+#~ msgid "Board Type"
+#~ msgstr "Tavletype"
 
 #~ msgid "YAHOO (WebKit)"
@@ -25988,4 +26230,7 @@
 #~ "Ikke last opp data etter  denne meldingen."
 
+#~ msgid "changesets"
+#~ msgstr "endringssett"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Bruk ufullstendige løsninger"
@@ -26005,2 +26250,5 @@
 #~ msgid "No data"
 #~ msgstr "Ingen data"
+
+#~ msgid "Remove relation member {0} {1}"
+#~ msgstr "Fjern relasjonsmedlem {0} {1}"
