Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 16179)
+++ applications/editors/josm/i18n/po/nb.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-19 22:13+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-02 16:44+0000\n"
+"Last-Translator: Stian Ellingsen <stiell@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
-msgstr "Bygger opp hoved skjermbilde"
+msgstr "Bygger opp hovedskjermbilde"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,32 @@
 msgstr "Hjelp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+"Kunne ikke lese projeksjon fra innstillinger. Bruker Mercators projeksjon."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Tips: Noen endringer kom fra å laste opp nye data til serveren."
-
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Ulagrede endringer"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
-msgstr "Det er ulagrede endringer. Forkast endringene og fortsette?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+msgstr "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Lagre og avslutt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
-msgstr "Slett forandringer og avslutt"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+msgstr "Forkast og avslutt"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Overser feilutformet URL: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+msgstr "Overser feilutformet URL: «{0}»"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Overser feilutformet fil URL: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+msgstr "Overser feilutformet fil-URL: «{0}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "Ukjent"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Om"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Om programmet"
@@ -131,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Siste endring på {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Feilrapporter"
@@ -170,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +179,27 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Les meg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revisjon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Bidrag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Om JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Filen finnes ikke."
@@ -208,14 +211,15 @@
 "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
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Velg minst en lukket linje å sammenføye med."
+msgstr "Velg minst én allerede opplastet node, linje eller relasjon."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Advarsel"
@@ -227,4 +231,5 @@
 "primitives only"
 msgstr ""
+"ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -232,9 +237,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53
 msgid "Add Node..."
-msgstr "Legg til node..."
+msgstr "Legg til node …"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 msgid "Add a node by entering latitude and longitude."
-msgstr "Legg til en node ved å taste inn lengdegrad og breddegra"
+msgstr "Legg til en node ved å skrive inn lengde- og breddegrad."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
@@ -261,14 +266,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38
 msgid "Use decimal degrees."
-msgstr "Bruk desimale grader."
+msgstr "Bruk desimalgrader."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39
 msgid "Negative values denote Western/Southern hemisphere."
-msgstr "Negative verdier betegner vestlige / sørlige hemisfæren."
+msgstr "Negative verdier betegner den vestlige/sørlige hemisfæren."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Breddegrad"
@@ -277,5 +282,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Lengdegrad"
@@ -283,5 +288,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Juster nodene til en sirkel"
@@ -289,10 +294,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 msgid "Move the selected nodes into a circle."
-msgstr "Flytt de valgte noder i en sirkel."
+msgstr "Flytt de valgte nodene i en sirkel."
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -338,5 +343,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 msgid "Move the selected nodes in to a line."
-msgstr "Flytt valgte noder til en linje."
+msgstr "Flytt valgte noder til en rett linje."
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
@@ -351,18 +356,19 @@
 "{0}, max is {1}"
 msgstr ""
+"Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende "
+"er {0}, maksimalt er {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "API-krav ikke møtt"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Klarte ikke starte API. Prøv igjen senere."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Ikke startet"
+msgstr "Klarte ikke starte API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -372,4 +378,5 @@
 "{1}"
 msgstr ""
+"Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
@@ -379,48 +386,49 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"Verdiens lengde for egenskap «{0}» i objekt {1} overstiger maksimalt tillatt "
+"lengde {2}. Verdiens lengde er {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Relasjonen har konflikter"
+msgstr "Forhåndsbetingelse brutt"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "last ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
-msgstr "Zoom til {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+msgstr "Gå til {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
-msgstr "Zoom skjermbilde til {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+msgstr "Skaler og flytt skjermbildet til {0}."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -430,9 +438,9 @@
 msgstr "Bilde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Inet utvalg å vise."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter å vise."
@@ -441,9 +449,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
-msgstr "Sammenføy Linjer"
+msgstr "Sammenføy linjer"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
-msgstr "Sammenføy flere Linjer til en"
+msgstr "Sammenføy flere linjer til én"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67
@@ -467,5 +475,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141
 msgid "Change directions?"
-msgstr "Endre rettninger?"
+msgstr "Endre retninger?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142
@@ -474,5 +482,6 @@
 "reverse some of them?"
 msgstr ""
-"Linjene har forkjellig retning. Kan ikke sammenføyes. Vil du snu på linjene?"
+"Linjene har forskjellig retning og kan ikke sammenføyes. Vil du snu "
+"retningen på noen av linjene?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -491,5 +500,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
 msgid "Solve Conflicts"
-msgstr "Løs konflikt"
+msgstr "Løs konflikter"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
@@ -515,5 +524,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
 msgid "Copy selected objects to paste buffer."
-msgstr "Kopier valgte objekt for til utklippstavle"
+msgstr "Kopier valgte objekter til utklippstavla."
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134
@@ -521,37 +530,41 @@
 msgstr "Velg noe å kopiere."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Lag en sirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Lag en sirkel fra tre valgte noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Velg kun tre noder eller en linje med kun tre noder."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Valgte noder er ikke i en sirkel."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Velg kun tre noder eller en linje med kun tre noder."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Slett"
@@ -573,5 +586,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98
 msgid "File exists. Overwrite?"
-msgstr "Filen finnes. Overskrive filen ?"
+msgstr "Filen finnes. Vil du overskrive filen?"
 
 #. Do it!
@@ -589,9 +602,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download from OSM..."
-msgstr "Last ned fra OSM..."
+msgstr "Last ned fra OSM …"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download map data from the OSM server."
-msgstr "Last ned kartdata fra OSM server."
+msgstr "Last ned kartdata fra OSM-tjeneren."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
@@ -601,5 +614,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -612,14 +625,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69
 msgid "Please select at least one task to download"
-msgstr "Velg minst en oppgave å laste ned"
+msgstr "Velg minst én oppgave å laste ned"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24
 msgid "Duplicate"
-msgstr "Dubliser"
+msgstr "Fordoble"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
 msgid "Duplicate selection by copy and immediate paste."
-msgstr "Dupliser utvalget med kopier og lim inn (straks etter)"
+msgstr "Fordoble utvalget ved å kopiere og umiddelbart lime inn."
 
 #. <button label="Info" hotkey="I">
@@ -642,5 +655,5 @@
 "tracks."
 msgstr ""
-"Merk: GPL er ikke kompatibelt med OSM lisens. Ikke last opp GPL lisensierte "
+"Merk: GPL er ikke kompatibel med OSM-lisensen. Ikke last opp GPL-lisensierte "
 "spor."
 
@@ -648,9 +661,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Export to GPX..."
-msgstr "Eksporter til GPX ..."
+msgstr "Eksporter til GPX …"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 msgid "Export the data to GPX file."
-msgstr "Eksporter dataene til GPX fil."
+msgstr "Eksporter dataene til GPX-fil."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55
@@ -664,5 +677,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85
 msgid "Add author information"
-msgstr "legg til info om opphavsmann"
+msgstr "Legg til informasjon om opphavsperson"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
@@ -672,9 +685,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
 msgid "E-Mail"
-msgstr ""
+msgstr "E-post"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
 msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
+msgstr "Opphavsrett (URL)"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100
@@ -684,5 +697,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102
 msgid "Copyright year"
-msgstr "Kopibeskyttet år:"
+msgstr "År for opphavsrett"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
@@ -696,5 +709,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
 msgid "Export and Save"
-msgstr "Eksporter og Lagre"
+msgstr "Eksporter og lagre"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
@@ -708,11 +721,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -723,5 +737,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Feil"
@@ -731,30 +745,30 @@
 msgstr "Velg en lisens"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM hjelpesider"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
-msgstr "Åpne i internettleser"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+msgstr "Åpne i nettleser"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
-msgstr "Rediger"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+msgstr "Endre"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -762,19 +776,19 @@
 msgstr "Last inn på nytt"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Feil ved nedlasting av {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -782,25 +796,24 @@
 "\">your language</A>."
 msgstr ""
+"Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A HREF="
+"\"{1}\">norsk (bokmål)</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
 msgid "History of Element"
-msgstr "Historikk på Elementet"
+msgstr "Historikk for elementet"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Vis historikk på OSM linjer eller noder."
+msgstr "Vis historikk for OSMs noder, linjer eller relasjoner."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Historikk på Elementet"
+msgstr "Informasjon om element"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Vis historikk på OSM linjer eller noder."
+msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -819,5 +832,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30
 msgid "No Shortcut"
-msgstr "Ingen Hurtigtast"
+msgstr "Ingen hurtigtast"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
@@ -861,15 +874,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
-msgstr ""
+msgstr "Speilvend"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 msgid "Mirror selected nodes and ways."
-msgstr ""
+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 ""
+msgstr "Velg minst én node eller linje."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
@@ -898,10 +911,10 @@
 msgstr "høyre"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -909,7 +922,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
-msgstr "Kan ikke flytte objekt ut i verdensrommet"
+msgstr "Kan ikke flytte objekter utenfor kartet."
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
@@ -944,10 +957,10 @@
 #, java-format
 msgid "Could not read \"{0}\""
-msgstr "Kan ikke lese {0}"
+msgstr "Klarte ikke lese «{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"
+msgstr "Åpne sted …"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -957,5 +970,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
 msgid "Separate Layer"
-msgstr "Separat Lag"
+msgstr "Separat lag"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
@@ -965,5 +978,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
 msgid "Download Location"
-msgstr "Last ned Sted"
+msgstr "Last ned sted"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
@@ -1002,11 +1015,11 @@
 "projection to get rid of this warning.<br>Do you want to continue?"
 msgstr ""
-"<html>Du har valgt EPSG:4326 projecsjon som kan gi uønsket<br>resultat ved "
-"vinkling til rette vinkler.<br>Bytt projeksjon for å unngå denne "
-"advarselen<br>Fortsett?"
+"<html>Du har valgt EPSG:4326-projeksjon som kan gi uønsket<br>resultat ved "
+"vinkling til rette vinkler.<br>Bytt projeksjon for å unngå denne advarselen."
+"<br>Vil du fortsette?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
 msgid "Only one node selected"
-msgstr "Bare en node er valgt"
+msgstr "Bare én node er valgt"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243
@@ -1022,5 +1035,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 msgid "Paste contents of paste buffer."
-msgstr "Lim inn fra utklippstavle"
+msgstr "Lim inn fra utklippstavla."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
@@ -1028,13 +1041,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79
 msgid "Paste Tags"
-msgstr "Lim inn Egenskaper"
+msgstr "Lim inn egenskaper"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
 msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "Bruk egenskaper i utklippstavle på alle valgte element."
+msgstr "Bruk egenskaper i utklippstavla på alle valgte element."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
 msgid "Preferences..."
-msgstr "Innstillinger..."
+msgstr "Innstillinger …"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
@@ -1045,14 +1058,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
 msgid "Preferences"
-msgstr "Alternativer"
+msgstr "Innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo"
-msgstr "Gjenopprett"
+msgstr "Gjør om"
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 msgid "Redo the last undone action."
-msgstr "Gjenopprett siste angre."
+msgstr "Gjør om siste angrede handling."
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
@@ -1068,10 +1081,10 @@
 #, java-format
 msgid "Could not rename the file \"{0}\"."
-msgstr "Kan ikke gi nytt navn til fila \"{0}\""
+msgstr "Klarte ikke gi nytt navn til fila «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
-msgstr "Snu retning på linje"
+msgstr "Snu retning på linjer"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1081,5 +1094,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56
 msgid "Please select at least one way."
-msgstr "Velg minst en linje"
+msgstr "Velg minst én linje"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
@@ -1094,12 +1107,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 msgid "Save the current data."
-msgstr "Lagre data"
+msgstr "Lagre gjeldende data."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #, java-format
 msgid "File {0} exists. Overwrite?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+msgstr "Filen {0} finnes allerede. Vil du skrive over den?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1108,65 +1121,64 @@
 "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Ingen åpne dokument å lagre"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokumentet er tomt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Lagre uansett"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 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. "
-"Fortsett?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+"Det finnes konflikter som må løses. Element med konflikter lagres ikke. Vil "
+"du fortsette?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
-msgstr "Avvis Konflikter og Lagre"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+msgstr "Avvis konflikter og lagre"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
-msgstr "Lagre OSM fil"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+msgstr "Lagre OSM-fil"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
-msgstr "Lagre GPX fil"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgstr "Lagre GPX-fil"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+msgstr "Lagre lag"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Kan ikke ta sikkerhetskopi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Ukjent filtype."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Det oppsto feil under lagring."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Det oppsto feil under gjenoppretting fra sikkerhetskopi."
@@ -1175,9 +1187,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 msgid "Save As..."
-msgstr "Lagre som..."
+msgstr "Lagre som …"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 msgid "Save the current data to a new file."
-msgstr "Lagre aktive data i ny fil"
+msgstr "Lagre aktive data i ny fil."
 
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
@@ -1196,5 +1208,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show Status Report"
-msgstr "Vis Statusrapport"
+msgstr "Vis statusrapport"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
@@ -1213,9 +1225,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
 msgid "Copy to clipboard and close"
-msgstr "Kopier til utklippstavlen og Lukk"
+msgstr "Kopier til utklippstavlen og lukk"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Lukk"
@@ -1228,5 +1241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
-msgstr "Splitt linje i valgt Node"
+msgstr "Splitt en linje i den valgte noden."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
@@ -1247,6 +1260,6 @@
 "There is more than one way using the nodes you selected. Please select the "
 "way also."
-msgstr[0] "Mer enn en linje bruker den  valgte Noden. Velg flere linjer."
-msgstr[1] "Mer enn en linje bruker de valgte Nodene. Velg flere linjer."
+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:138
@@ -1278,14 +1291,13 @@
 "You should verify this and correct it when necessary."
 msgstr ""
-"Medlemskap i en Relasjon basert på en Rolle er kopiert til alle nye linjer\n"
+"Medlemskap i en relasjon basert på en rolle er kopiert til alle nye linjer.\n"
 "Sjekk og korriger slik at dette er riktig."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Medlemskap i en Relasjon basert på en Rolle er kopiert til alle nye linjer\n"
+"Et relasjonsmedlemskap  er kopiert til alle nye linjer.\n"
 "Sjekk og korriger slik at dette er riktig."
 
@@ -1298,14 +1310,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Toggle GPX Lines"
-msgstr "Slå GPX linjer av - på"
+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"
+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å av/på global settings ''{0}''."
+msgstr "Slår av/på global innstilling «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
@@ -1336,5 +1348,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112
 msgid "Select either:"
-msgstr "Velg :"
+msgstr "Velg:"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
@@ -1344,9 +1356,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "* One node that is used by more than one way, or"
-msgstr "* En node som brukes av flere linjer, eller"
+msgstr "– En node som brukes av flere linjer, eller"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
 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"
+msgstr "– En node som er brukt av flere linjer, og en av linjene, eller"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
@@ -1354,10 +1366,10 @@
 "* 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"
+"– En linje som har en eller flere noder, som er brukt av flere linjer, eller"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 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."
+msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
@@ -1368,7 +1380,7 @@
 "own copy and all nodes will be selected."
 msgstr ""
-"OBS: Når du velger en linje, vil denne få nye kopier av noder uten  \n"
-"tilknytninger og nodene vil bli valgt. Ellers vil alle linjer vil få egne \n"
-"kopier og alle noder blir valgt."
+"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:157
@@ -1394,5 +1406,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
-msgstr "Angre siste aksjon."
+msgstr "Angre siste handling."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
@@ -1405,5 +1417,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
-msgstr "Fjern objekt fra utvalg."
+msgstr "Fjern alle objekter fra utvalg."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
@@ -1418,9 +1430,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
 msgid "Update Data"
-msgstr "Oppdater Data"
+msgstr "Oppdater data"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
 msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr "Oppdaterer aktuelt data lag fra server (laster ned på nytt)"
+msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:63
@@ -1431,100 +1443,100 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
 msgid "Failed to update the selected primitives."
-msgstr ""
+msgstr "Klarte ikke oppdatere valgte objekter."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
 msgid "Update failed"
-msgstr ""
+msgstr "Oppdatering feilet"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
 #, java-format
 msgid "Could not find primitive with id {0} in the current dataset"
-msgstr ""
+msgstr "Fant ikke objekt med ID {0} i gjeldende datasett"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
 msgid "Missing primitive"
-msgstr ""
+msgstr "Mangler objekt"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
 msgid "Update Selection"
-msgstr ""
+msgstr "Oppdater utvalg"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
 msgid "Updates the currently selected primitives from the server"
-msgstr ""
+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 ""
+msgstr "Det er ingen valgte objekter å oppdatere"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "Selection empty"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+msgstr "Utvalget er tomt"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
-msgstr "Last opp til OSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+msgstr "Last opp til OSM …"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
-msgstr "Last opp alle endringer til OSM serveren."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+msgstr "Last opp alle endringer til OSM-tjeneren."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objekter som legges til:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objekter som endres:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objekter som slettes:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 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:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Laste opp disse endringene?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Last opp endringer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 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:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Data inneholder uløste konflikter som først må løses."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Ingen endringer å laste opp."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+msgstr "Laster opp"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+msgstr "Oppdaterer objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+msgstr "Synkroniser kun {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+msgstr "Synkroniser hele datasettet"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1537,18 +1549,25 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+"<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:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
-msgstr ""
+msgstr "Konflikt oppdaget"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+msgstr "Uventet returverdi. Mottok {0}."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1558,11 +1577,15 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+"<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:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1571,10 +1594,12 @@
 "html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+"<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/actions/UploadAction.java:426
 msgid "Precondition violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+msgstr "Forhåndsbetingelse brutt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1583,19 +1608,22 @@
 "<br>{0}</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+"<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/actions/UploadAction.java:470
 msgid "Primitive already deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+msgstr "Objekt allerede slettet"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+msgstr "Klarte ikke laste opp til OSM-API"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1603,4 +1631,6 @@
 "Check the server URL in your preferences and your internet connection."
 msgstr ""
+"Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n"
+"Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker."
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -1686,38 +1716,29 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
 msgid "Slower Forward"
-msgstr "Spill av Sakte"
+msgstr "Spill av sakte"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
 msgid "Downloading GPS data"
-msgstr "Laster ned GPS data"
+msgstr "Laster ned GPS-data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47
 msgid "Downloaded GPX Data"
-msgstr "Laster ned GPX data"
+msgstr "Laster ned GPX-data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
 msgid "Raw GPS data"
-msgstr "GPS rådata"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+msgstr "GPS-rådata"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
-msgstr "Last ned data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+msgstr "Laster ned data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Ingenting er importert."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Data Lag {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
-msgstr "OpenStreetMap data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Data Lag"
+msgstr "OpenStreetMap-data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1728,9 +1749,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
 msgid "The following errors occurred during mass download:"
-msgstr ""
+msgstr "Følgende feil oppstod under massenedlasting:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
 msgid "Errors during Download"
-msgstr "Feil under nedlasting:"
+msgstr "Feil under nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
@@ -1743,8 +1764,13 @@
 "</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:150
 msgid "Deleted or moved primitives"
-msgstr ""
+msgstr "Slettede eller flyttede objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1754,10 +1780,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
 msgid "Delete nodes or ways."
-msgstr "Slett Noder eller Linjer"
+msgstr "Slett noder eller linjer."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1770,6 +1796,6 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
-"Klikk for sletting. Shift: slett linje segment. Alt: Ikke slett ubrukte "
-"Noder ved sletting av linjer. Ctrl: slett objekt med referanse."
+"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:90
@@ -1781,5 +1807,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
 msgid "Draw nodes"
-msgstr "Digitaliser Noder"
+msgstr "Tegn noder"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
@@ -1795,5 +1821,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336
 msgid "Cannot add a node outside of the world."
-msgstr "Kan ikke velge Node fra verdensrommet."
+msgstr "Kan ikke legge til node utenfor kartet."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
@@ -1803,26 +1829,26 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node into way"
-msgstr "Legg til Node i linje"
+msgstr "Legg til node i linje"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
 msgid "Connect existing way to node"
-msgstr "Knytt eksisterende linje til Node"
+msgstr "Knytt eksisterende linje til node"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Add a new node to an existing way"
-msgstr "Legg til en Node i eksisterende linje"
+msgstr "Legg til en node i eksisterende linje"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add node into way and connect"
-msgstr "Legg til Node i linje og lag tilknytning"
+msgstr "Legg til node i linje og lag tilknytning"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881
 msgid "Create new node."
-msgstr "Lag ny Node"
+msgstr "Lag ny node."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908
 msgid "Select node under cursor."
-msgstr "Veg Node ved markøren."
+msgstr "Veg node under pekeren."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
@@ -1830,14 +1856,14 @@
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Sett inn ny Node i linje."
-msgstr[1] "Sett inn ny Node i {0} linjer."
+msgstr[0] "Sett inn ny node i linje."
+msgstr[1] "Sett inn ny node i {0} linjer."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
 msgid "Start new way from last node."
-msgstr "Start ny linje fra siste Node."
+msgstr "Start ny linje fra siste node."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
 msgid "Continue way from last node."
-msgstr "Fortsett samme linje fra siste Node."
+msgstr "Fortsett samme linje fra siste node."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
@@ -1853,5 +1879,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
 msgid "Create areas"
-msgstr "Tegn arealer"
+msgstr "Tegn områder"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
@@ -1860,7 +1886,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Slipp museknapp for å velge objekt i rektangelet."
+msgstr "Slipp museknappen for å velge objektene i rektangelet."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
@@ -1869,5 +1895,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Slipp museknappen for å avslutte rotasjon."
@@ -1875,5 +1901,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267
 msgid "Drag a way segment to make a rectangle."
-msgstr "Trekk ut et segment av linje for å danne rektangel."
+msgstr "Dra et linjesegment for å lage et rektangel."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
@@ -1882,10 +1908,10 @@
 "+release to synchronize audio at that point."
 msgstr ""
-"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; SHIFT"
+"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift"
 "+slipp synkroniserer audio i dette punktet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1893,16 +1919,39 @@
 msgstr "Velg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Velg, flytt og roter objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
 msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Legg til og flytt en kunstig Node til en linje"
-msgstr[1] "Legg til og flytt en kunstig Node til {0} linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+msgstr[0] "Legg til og flytt en kunstig node til en linje"
+msgstr[1] "Legg til og flytt en kunstig node til {0} linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Flytt til venstre"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Flytt til venstre"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Angre"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1911,5 +1960,5 @@
 "nærmeste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1927,13 +1976,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
 msgid "Zoom and move map"
-msgstr "Zoom and flytt kart"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+msgstr "Skaler og flytt kart"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
-"Zoom med  Ctrl+. or Ctrl+, eller trekking; flytt med Ctrl+opp, venstre, ned, "
-"høyre; flyttezoom med høyre museknapp"
+"Skaler med Ctrl + . og Ctrl + , eller venstre museknapp; flytt med Ctrl + "
+"piltaster; flytt utsnitt med høyre museknapp"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
@@ -1941,5 +1990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45
 msgid "Search..."
-msgstr "Søk ..."
+msgstr "Søk …"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
@@ -1956,5 +2005,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57
 msgid "Please enter a search string."
-msgstr "Søk etter teksten."
+msgstr "Skriv inn søketekst."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61
@@ -1972,25 +2021,25 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
 msgid "case sensitive"
-msgstr "skill på store / små bokstaver"
+msgstr "skill mellom store/små bokstaver"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
 msgid "regular expression"
-msgstr "vanlig uttrykk"
+msgstr "regulært uttrykk"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-msgstr "<b>Nansens gate</b> - 'Nansen' og 'gate' i nøkkel eller navn."
+msgstr "<b>Nansens gate</b> – «Nansens» og «gate» i nøkkel eller navn."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr "<b>Nansens gate</b> - \"Nansen\" og \"gate\" i nøkkel eller navn."
+msgstr "<b>\"Nansens gate\"</b> – «Nansens gate» i nøkkel eller navn."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr "<b>name:Nan</b> - 'Nan' finnes innen navn."
+msgstr "<b>name:Nan</b> – «Nan» finnes innen navnet."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=route</b> – nøkkel «type» med eksakt verdi «route»."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
@@ -1999,12 +2048,14 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b> -– nøkkel «type» med hvilken som helst verdi. Prøv også "
+"<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr "<b>-name:Nan</b> - ingen 'Nan'  innen navn."
+msgstr "<b>-name:Nan</b> – «Nan» finnes ikke innen navnet."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr "<b>foot:</b> - key=foot kan ha alle verdier."
+msgstr "<b>foot:</b> – nøkkel «foot» med hvilken som helst verdi."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
@@ -2015,33 +2066,33 @@
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>type:</b> - type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr "<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - alle object redigert av bruker (user)"
+msgstr "<b>user:</b>… – alle objekter redigert av angitt bruker"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
 msgid "<b>id:</b>... - object with given ID"
-msgstr "<b>id:</b>... - objekt med gitt ID"
+msgstr "<b>id:</b>… – objekt med angitt ID"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
 msgid "<b>nodes:</b>... - object with given number of nodes"
-msgstr "<b>nodes:</b>... - objekt med bestemt antall noder (nodes)"
+msgstr "<b>nodes:</b>… – objekt med angitt antall noder"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
 msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - alle endrede objekt"
+msgstr "<b>modified</b> – alle endrede objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - alle objekt i utvalg"
+msgstr "<b>selected</b> – alle objekter i utvalg"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - all uferdige (incomplete) objekt"
+msgstr "<b>incomplete</b> – alle uferdige objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - alle objekt uten egenskaper (untagged)"
+msgstr "<b>untagged</b> – alle objekter uten egenskaper"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
@@ -2049,4 +2100,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
+"<b>child <i>uttrykk</i></b> – alle underobjekter av objektene i uttrykket"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
@@ -2054,17 +2106,19 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
+"<b>parent <i>uttrykk</i></b> – alle overobjekter av objektene i uttrykket"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Bruk <b>|</b> eller <b>OR</b> for søk med logisk ELLER (OR)"
+msgstr "Bruk <b>|</b> eller <b>OR</b> for søk med logisk <i>eller</i>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
-"Bruk <b>\"</b> for å vise til egenskapsnavn (f.eks hvis nøkkel inneholder :)"
+"Bruk <b>\"</b> for å søke etter operatortegn (f.eks. hvis nøkkel inneholder "
+"«:»)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Bruk parantes <b>(</b> and <b>)</b> ved grupper av uttrykk"
+msgstr "Bruk <b>(</b> og <b>)</b> for å gruppere uttrykk"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
@@ -2075,20 +2129,20 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Start Search"
-msgstr "Start Søk"
+msgstr "Start søk"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 #, java-format
 msgid "No match found for ''{0}''"
-msgstr "Fant ingen ''{0}''"
+msgstr "Fant ingen treff for «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
-msgstr "Ingen element ble lagt til utvalg etter søk etter ''{0}''"
+msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "Ingenting fjernet fra utval ved søk etter ''{0}''"
+msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
@@ -2116,5 +2170,5 @@
 "{2}"
 msgstr ""
-"Regex \"{0}\" genererte feimelding ved {1}, full error:\n"
+"Regulært uttrykk «{0}» har en feil ved posisjon {1}, feilmelding:\n"
 "\n"
 "{2}"
@@ -2123,14 +2177,15 @@
 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:355
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
+msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493
 #, java-format
 msgid "Unexpected token: {0}"
-msgstr ""
+msgstr "Uventet symbol: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514
@@ -2148,5 +2203,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592
 msgid "Wrong number of parameters for nodes operator."
-msgstr ""
+msgstr "Feil antall parametere for nodes-operator."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
@@ -2156,9 +2211,11 @@
 "nodes or range, for example nodes:10-20"
 msgstr ""
+"Ugyldig verdi for nodes-operator: {0}. Verdien må være antall noder eller "
+"intervall, for eksempel nodes:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
-msgstr ""
+msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
@@ -2169,9 +2226,9 @@
 #, java-format
 msgid "Contact {0}..."
-msgstr "Koble til {0}..."
+msgstr "Koble til {0} …"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
-msgstr "Laster ned..."
+msgstr "Laster ned …"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
@@ -2179,5 +2236,5 @@
 #, java-format
 msgid "Could not read from URL: \"{0}\""
-msgstr "Kunne ikke lese fra URL: \"{0}\""
+msgstr "Klarte ikke lese fra URL: «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62
@@ -2185,41 +2242,33 @@
 #, java-format
 msgid "Parsing error in URL: \"{0}\""
-msgstr "Feil ved sending til URL: \"{0}\""
+msgstr "Feil i URL: «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
 msgid "Error while communicating with server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Legg til"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Endre"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+msgstr "Feil ved tjenerkommunikasjon."
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Slett {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Endre {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
-msgstr "Fjern \"{0}\" i {1} ''{2}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+msgstr "Fjern «{0}» i {1} «{2}»"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
-msgstr "Sett {0}={1} i {2} ''{3}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+msgstr "Sett {0}={1} i {2} «{3}»"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2227,47 +2276,54 @@
 msgid_plural "objects"
 msgstr[0] "objekt"
-msgstr[1] "Objekter"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+msgstr[1] "objekter"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Fjern \"{0}\" i {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+msgstr "Fjern «{0}» i {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Sett {0}={1} i {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr "EndreRelasjonsmedlemsrolle"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
+msgstr "Løs koordinatkonflikter i {0}"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+msgstr "kan ikke løse uavgjort konflikt"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Slett {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Slett {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Relasjonen har konflikter"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2275,14 +2331,14 @@
 "Delete from relation?"
 msgstr ""
-"Utvalg \"{0}\" er brukr i relasjon \"{1}\" med rolle {2}.\n"
-"Slett fra relasjon?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+"Utvalg «{0}» brukes av relasjon «{1}» med rolle {2}.\n"
+"Vil du slette utvalget fra relasjonen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2290,13 +2346,13 @@
 "Delete from relation?"
 msgstr ""
-"Utvalg \"{0}\" er brukt u relasjon \"{1}\".\n"
-"Slett fra relasjon?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+"Utvalg «{0}» brukes av relasjon «{1}».\n"
+"Vil du slette utvalget fra relasjonen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Splitt linje i segment"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2304,38 +2360,38 @@
 "use them.<br>Do you really want to delete?"
 msgstr ""
-"Du er i ferd med å slette Noder utenfor nedlastet område.<br>Dette kan skape "
-"problem fordi de kan være i bruk av andre objekt (som du ikke kan se nå) ."
-"<br>Er du sikker på at du vil slette?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+"Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan skape "
+"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se "
+"nå) .<br>Er du sikker på at du vil slette nodene?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgstr "Løs slettekonflikt i {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Flytt"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
 msgid_plural "nodes"
 msgstr[0] "node"
-msgstr[1] "Node"
+msgstr[1] "noder"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 msgid "Purging 1 primitive"
-msgstr ""
+msgstr "Rydder ut 1 objekt"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "fjerner henvisning fra vei {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2345,50 +2401,59 @@
 "{1}"
 msgstr ""
+"Advarsel: Rydder ut linje {0} fordi antall noder falt til under 2. Nåværende "
+"er {1}."
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "fjerner henvisning fra relasjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Løs medlemskonflikter i relasjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Fjernede Element fra Relasjoner"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "Fjern medlem i relasjon"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Roter"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Slett {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sekvens"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
 #, java-format
 msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
+msgstr "Løs {0} egenskapskonflikter i {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+msgstr "Gjenopprett {0} objekter"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
 #, java-format
 msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+msgstr "Løs versjonskonflikter for {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
 #, java-format
 msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
+msgstr "Løs nodekonflikter i vei {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr "Lokalt datasett inneholder ikke en egenskap med nøkkel {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
 msgid "Apply?"
-msgstr "Gjennomfør?"
+msgstr "Gjennomføre?"
 
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142
@@ -2397,5 +2462,5 @@
 "its nodes are suggested in order to maintain data consistency."
 msgstr ""
-"Når du snur rening på linje blir følgende egenskaper endret for å "
+"Når du snur reningen på denne linjen blir følgende egenskaper endret for å "
 "opprettholde dataintegritet."
 
@@ -2406,5 +2471,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
 msgid "Old role"
-msgstr "Eks rolle"
+msgstr "Tidligere rolle"
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
@@ -2414,9 +2479,9 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
 msgid "Old key"
-msgstr "Eks nøkkel"
+msgstr "Tidligere nøkkel"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
 msgid "Old value"
-msgstr "Eks verdi"
+msgstr "Tidligere verdi"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
@@ -2446,5 +2511,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
 msgid "Roles in relations referring to"
-msgstr "Roller i relasjon viser til"
+msgstr "Roller i relasjoner som viser til"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
@@ -2455,51 +2520,77 @@
 #, java-format
 msgid "Malformed config file at lines {0}"
-msgstr "Config file har feil i linje {0}"
+msgstr "Innstillingsfil har feil i linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
 #, java-format
 msgid "Cannot open preferences directory: {0}"
-msgstr "Kan ikke åpne oppsett: {0}"
+msgstr "Kan ikke åpne innstillingsmappe: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
 #, java-format
 msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Feil i oppsett fila. Backup lagres i {0}."
+msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
 #, java-format
 msgid "Preferences stored on {0}"
-msgstr "Oppsett lagret i {0}"
+msgstr "Innstillinger lagret i {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunne ikke laste opp oppsett. Årsak: {0}"
+msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
 msgid "Could not load preferences from server."
-msgstr "Kan ikke lese oppsett fra server."
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgstr "Klarte ikke lese innstillinger fra tjener."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "parameter «{0}» må ha en verdi"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "Desimalgrader"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
-msgstr "Grader Minutt Sekunder"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgstr "Grader, minutter, sekunder"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "Ø"
@@ -2508,7 +2599,7 @@
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+msgstr "parameter {0} > 0 nødvendig. Leste {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2528,10 +2619,10 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 msgid "nodes"
-msgstr ""
+msgstr "noder"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2542,5 +2633,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 msgid "ways"
-msgstr ""
+msgstr "linjer"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2551,28 +2642,28 @@
 msgid "relation"
 msgid_plural "relations"
-msgstr[0] "Relasjon"
-msgstr[1] "Relasjoner"
+msgstr[0] "relasjon"
+msgstr[1] "relasjoner"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
 msgid "relations"
-msgstr ""
+msgstr "relasjoner"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changeset"
-msgstr ""
+msgstr "endringssett"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changesets"
-msgstr ""
+msgstr "endringssett"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-msgstr ""
+msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-msgstr ""
+msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
@@ -2581,9 +2672,9 @@
 msgid_plural "{0} members"
 msgstr[0] "{0} medlem"
-msgstr[1] "{0} Medlemmer"
+msgstr[1] "{0} medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136
 msgid "highway"
-msgstr "riksvei"
+msgstr "ferdselsvei"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137
@@ -2605,61 +2696,46 @@
 msgid "{0} node"
 msgid_plural "{0} nodes"
-msgstr[0] "{0} Node"
-msgstr[1] "{0} Noder"
+msgstr[0] "{0} node"
+msgstr[1] "{0} noder"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153
 msgid "There's no primitive with version {0} in this history"
-msgstr ""
+msgstr "Denne historikken har ikke noe element med versjon {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162
 msgid "There's no version valid at date ''{0}'' in this history"
-msgstr ""
+msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173
 #, java-format
 msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-msgstr ""
+msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
 msgid "no earliest version found. History is empty."
-msgstr ""
+msgstr "Fant ingen første versjon. Historikken er tom."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
 msgid "no latest version found. History is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+msgstr "Fant ingen siste versjon. Historikken er tom."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+msgstr "Fant ikke noe objekt med ID {0} i dette datasettet"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
 msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+msgstr "parameter «{0}» > 0 forventet – leste «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-msgstr ""
+msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
@@ -2667,129 +2743,129 @@
 #, java-format
 msgid "parameter {0} not in range 0..{1}, got {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Linje for areal er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
-msgstr "multipolygon linje ''{0}'' er ikke lukket."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+msgstr "multipolygon-linje «{0}» er ikke lukket."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
-msgstr "Tomt element in Relasjon."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+msgstr "Tomt medlem i relasjon."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
-msgstr "Slettet medlem ''{0}'' i relasjon."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+msgstr "Slettet medlem «{0}» i relasjon."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
-msgstr "Linje ''{0}'' med færre enn to punkt."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+msgstr "Linje «{0}» med færre enn to punkter."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
-msgstr "Funnet mere enn en linje med \"from\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+msgstr "Fant mer enn én linje med «from»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
-msgstr "Funnet mere enn en linje med \"to\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+msgstr "Fant mer enn én linje med «to»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
-msgstr "Funnet mere enn en  \"via\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+msgstr "Fant mer enn én \"via\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
-msgstr "Ukjent rolle ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+msgstr "Ukjent rolle «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
-msgstr "Ukjent medlemstype for ''{0}''."
+msgstr "Ukjent medlemstype for «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr "Fant ingen linje med «from»."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
-msgstr "Ikke funnet linje med \"from\"."
+msgid "No \"to\" way found."
+msgstr "Fant ingen linje med «to»."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr "Ikke funnet linje med \"to\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
-msgstr "Ikke funnet linje eller Node med \"via\"."
+msgstr "Fant ingen node eller linje med «via»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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:619
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr "Linje med \"from\" har ikke start eller slutt i \"via\" Node ."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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 ."
+msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+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:635
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr "Linje med \"from\" har ikke start eller slutt i \"via\" linje."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
-msgstr "linje med \"to\" har ikke start eller slutt i \"via\" linje."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
-msgstr "Fant ikke style for restriksjon {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+msgstr "Fant ikke stil for restriksjon {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, 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:824
+msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
-msgstr "I multipolygon er ''{0}'' ikke linje."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+msgstr "Multipolygon-medlem «{0}» er ikke en linje."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
-msgstr "Ingen ytre (outer) linje for multipolygon ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+msgstr "Ingen ytre linje for multipolygon «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, 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:970
+msgstr "Skjæring mellom linjene «{0}» og «{1}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
-msgstr "Indre linje (inner) ''{0}'' er utenfor."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+msgstr "Indre linje «{0}» er utenfor."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr "Style for indre linje ''{0}'' er samme som multipolygon."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+msgstr "Stil for indre linje «{0}» er samme som multipolygon."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
-msgstr "Style for ytre linje (outer) ''{0}'' passer ikke."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+msgstr "Stil for ytre linje «{0}» passer ikke."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "Uten egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "tekst"
@@ -2797,5 +2873,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2804,4 +2880,7 @@
 "Keeping my primitive. "
 msgstr ""
+"Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens element "
+"med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne "
+"selvmotsigelsen. Beholder lokalt element. "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -2823,6 +2902,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "bakgrunn"
@@ -2832,24 +2911,9 @@
 msgstr "fremhevet"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326 (lengde- og breddegrad)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
 msgstr ""
-"Kartprojeksjonen \"{0}\" er bare laget for\n"
-"nordlige grader mellom 46.1° og57° .\n"
-"Velg annen kartprojeksjon når du ikke bruker\n"
-"en fransk WMS server.\n"
-"Ikke last opp data etter denne beskjeden."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2859,42 +2923,30 @@
 "and start a new layer on the new zone."
 msgstr ""
-"VIKTIG : data ligger langt unna\n"
-"grensene for den aktive Lambert sone.\n"
+"VIKTIG: data ligger langt unna\n"
+"grensene for den aktive Lambert-sonen.\n"
 "Ikke last opp data etter denne beskjeden.\n"
-"Angre siste aksjon, lagre arbeidet\n"
-"og start et nytt Lag i en annen sone."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+"Angre siste handling, lagre arbeidet\n"
+"og start et nytt lag i en annen sone."
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
-msgstr "Lambert Zone (Frankrike)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+msgstr "Lambert-sone (Frankrike)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
-msgstr "Lambert Zone (Estland)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+msgstr "Lambert-sone (Estland)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Kartprojeksjonen \"{0}\" er bare beregnet på\n"
-"breddegrader mellom 45.7° og 47.9°\n"
-"og lengdegrader mellom 5.7° og 10.6°.\n"
-"Benytt en annen kartprojeksjon når du jobber\n"
-"andre steder enn Sveits eller  Lichtenstein.\n"
-"Ikke last opp data etter  denne meldingen."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveits)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Flytt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2906,14 +2958,14 @@
 msgstr "Kan ikke lagre bokmerke."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
-msgstr "Dagens nyheter er ikke tilgjengelig"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+msgstr "Dagens melding er ikke tilgjengelig"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
-msgstr "- aktive Versjon er {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+msgstr "- aktive versjon er {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Laster ned \"Dagens melding\""
@@ -2922,9 +2974,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
 msgid "Upload Preferences"
-msgstr "Last opp oppsett"
+msgstr "Last opp innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
 msgid "Upload the current preferences to the server"
-msgstr "Last opp aktivt oppsett til server"
+msgstr "Last opp aktive innstillinger til tjener"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
@@ -2944,5 +2996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "Endre vinduets størrelse til oppgitt geometri  (format: WIDTHxHEIGHT)"
+msgstr "Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
@@ -2957,6 +3009,6 @@
 "filename"
 msgstr ""
-"Last ned alle. Kan være x1,y1,x2,y2 en URL som inneholder lat=y&lon=x&zoom=z "
-"eller filnavn"
+"Last ned alle. Kan være x1,y1,x2,y2, en URL som inneholder "
+"lat=y&lon=x&zoom=z, eller filnavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
@@ -2965,6 +3017,6 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"Last ned alle som rå GPS filer. Kan være x1,y1,x2,y2 en URL som inneholder "
-"lat=y&lon=x&zoom=z eller filnavn"
+"Last ned alle som rå GPS-filer. Kan være x1,y1,x2,y2. en URL som inneholder "
+"lat=y&lon=x&zoom=z, eller filnavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -2982,5 +3034,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "If specified, reset the configuration instead of reading it."
-msgstr "Hvis gitt, reset konfigurasjon i stedet for å lese den inn."
+msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
@@ -3005,5 +3057,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
-msgstr "Innstillinger"
+msgstr "innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
@@ -3013,5 +3065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
-msgstr "Standard verdi for unix geometri"
+msgstr "Standard Unix-geometri"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
@@ -3037,9 +3089,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
-msgstr "Start med full skjerm"
+msgstr "Start maksimert"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
-msgstr "Sett oppsett til standard"
+msgstr "Gå tilbake til standardinnstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
@@ -3057,5 +3109,5 @@
 msgstr ""
 "Parametre leses i gitt rekkefølge, så last inn data før\n"
-"du prøver --utvalg"
+"du prøver --selection"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
@@ -3106,5 +3158,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3160,11 +3211,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
 msgid "Zoom in"
-msgstr "Zoom inn"
+msgstr "Forstørr"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
 msgid "Zoom out"
-msgstr "Zoom ut"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+msgstr "Forminsk"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "målestokk"
@@ -3172,5 +3223,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
 msgid "The geographic longitude at the mouse pointer."
-msgstr "Nordlige (eller sør) grader ved musepeker."
+msgstr "Lengdegrad ved musepekeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
@@ -3180,38 +3231,43 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The geographic latitude at the mouse pointer."
-msgstr "Østlige (eller vest) grader ved musepeker."
+msgstr "Breddegrad ved musepekeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The angle between the previous and the current way segment."
-msgstr "Vinkelendring fram til aktuelt linje segment"
+msgstr "Vinkel mellom forrige og nåværende linjesegment."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The (compass) heading of the line segment being drawn."
-msgstr "Kompassretning på segment som tegnes."
+msgstr "Kompassretning på segmentet som tegnes."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The length of the new way segment being drawn."
-msgstr "Lengden på segment som tegnes."
+msgstr "Lengden på segmentet som tegnes."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166
 msgid "(no object)"
-msgstr "(inget objekt)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+msgstr "(intet objekt)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
-msgstr "Layer er ikke i lista."
+msgstr "Laget er ikke i lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
 msgid "Contacting the OSM server..."
-msgstr "Kontacter OSM server..."
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+msgstr "Kontakter OSM-tjeneren …"
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
-msgstr "Feil ved oversendelse"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+msgstr "Feil ved tolking"
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
-msgstr "Fil ikke funnet"
+msgstr "Fant ikke fila"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3231,5 +3287,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
 msgid "unset: do not set this property on the selected objects"
-msgstr "unset: ikke sett egenskap på vallgt objekt"
+msgstr "unset: ikke sett egenskap på valgte objekter"
 
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
@@ -3242,5 +3298,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
 msgid "My with Their"
-msgstr ""
+msgstr "Lokal med tjeners"
 
 #. *
@@ -3249,5 +3305,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
 msgid "My with Merged"
-msgstr ""
+msgstr "Lokal med sammenslått"
 
 #. *
@@ -3256,18 +3312,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
 msgid "Their with Merged"
-msgstr ""
+msgstr "Tjeners med sammenslått"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
-msgstr ""
+msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
 msgid "Properties"
-msgstr ""
+msgstr "Egenskaper"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3277,10 +3334,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
-msgstr ""
+msgstr "Noder"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Medlemmer"
@@ -3288,19 +3348,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
 msgid "No pending tag conflicts to be resolved"
-msgstr ""
+msgstr "Ingen gjenværende egenskapskonflikter å løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
 #, java-format
 msgid "Tags({0} conflicts)"
-msgstr ""
+msgstr "Egenskaper ({0} konflikter)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
+msgstr "{0} gjenværende egenskapskonflikter å løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
 msgid "Nodes(resolved)"
-msgstr ""
+msgstr "Noder (løst)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
@@ -3308,16 +3368,18 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
+"Liste over sammenslåtte noder er låst. Ingen gjenværende konflikter i denne "
+"linjas nodeliste."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
 msgid "Nodes(with conflicts)"
-msgstr ""
+msgstr "Noder (med konflikter)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
 msgid "Pending conflicts in the node list of this way"
-msgstr ""
+msgstr "Gjenværende konflikter i denne veiens nodeliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
 msgid "Members(resolved)"
-msgstr ""
+msgstr "Medlemmer (løst)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
@@ -3326,28 +3388,30 @@
 "relation"
 msgstr ""
+"Liste over sammenslåtte medlemmer er låst. Ingen gjenværende konflikter i "
+"denne relasjonens medlemsliste."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
 msgid "Members(with conflicts)"
-msgstr ""
+msgstr "Medlemmer (med konflikter)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
 msgid "Pending conflicts in the member list of this relation"
-msgstr ""
+msgstr "Gjenværende konflikter i denne relasjonens medlemsliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
 msgid "No pending property conflicts"
-msgstr ""
+msgstr "Ingen gjenværende egenskapskonflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
 msgid "Properties(with conflicts)"
-msgstr ""
+msgstr "Egenskaper (med konflikter)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
 msgid "Pending property conflicts to be resolved"
-msgstr ""
+msgstr "Gjenværende egenskapskonflikter å løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
 msgid "Conflict Resolution"
-msgstr ""
+msgstr "Konfliktløsning"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
@@ -3355,5 +3419,5 @@
 #, java-format
 msgid "parameter current out of range: got {0}"
-msgstr ""
+msgstr "parameter «current» utenfor rekkevidde: leste {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
@@ -3361,32 +3425,32 @@
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
-msgstr ""
+msgstr "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
-msgstr ""
+msgstr "Uventet verdi for parameter «index». Leste {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
-msgstr ""
+msgstr "fant ikke {0} i liste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
 msgid "lock scrolling"
-msgstr ""
+msgstr "synkron rulling"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
 msgid "Compare "
-msgstr ""
+msgstr "Sammenlikn "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
 msgid "My version"
-msgstr ""
+msgstr "Lokal versjon"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Liste over elementer i det lokale datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
@@ -3394,5 +3458,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
 msgid "Merged version"
-msgstr ""
+msgstr "Sammenslått versjon"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
@@ -3401,29 +3465,35 @@
 "decisions are applied."
 msgstr ""
+"Liste over sammenslåtte elementer. De vil erstatte lokale elementer når "
+"sammenslåingsvalgene tas i bruk."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
 msgid "Their version"
-msgstr ""
+msgstr "Tjenerversjon"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Liste over elementer i tjenerens datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
 msgid "> top"
-msgstr ""
+msgstr "> topp"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
+"Kopier valgte lokale elementer til starten av lista over sammenslåtte "
+"elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
 msgid "> bottom"
-msgstr ""
+msgstr "> bunn"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
+"Kopier valgte lokale elementer til slutten av lista over sammenslåtte "
+"elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
@@ -3432,4 +3502,6 @@
 "merged elements"
 msgstr ""
+"Kopier valgte lokale elementer til plassen før første valgte element i lista "
+"over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
@@ -3438,12 +3510,18 @@
 "merged elements"
 msgstr ""
+"Kopier valgte lokale elementer til plassen etter første valgte element i "
+"lista over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
+"Kopier valgte elementer på tjeneren til starten av lista over sammenslåtte "
+"elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
+"Kopier valgte elementer på tjeneren til slutten av lista over sammenslåtte "
+"elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
@@ -3452,4 +3530,6 @@
 "of merged elements"
 msgstr ""
+"Kopier valgte elementer på tjeneren til plassen før første valgte element i "
+"lista over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
@@ -3458,25 +3538,27 @@
 "merged elements"
 msgstr ""
+"Kopier valgte elementer på tjeneren til plassen etter første valgte element "
+"i lista over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
 msgid "Up"
-msgstr ""
+msgstr "Opp"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
 msgid "Move up the selected elements by one position"
-msgstr ""
+msgstr "Flytt valgte elementer opp én plass"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
 msgid "Down"
-msgstr ""
+msgstr "Ned"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
 msgid "Move down the selected entries by one position"
-msgstr ""
+msgstr "Flytt valgte elementer ned én plass"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3485,23 +3567,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
-msgstr ""
+msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
 msgid "Freeze"
-msgstr ""
+msgstr "Lås"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
-msgstr ""
+msgstr "Lås gjeldende liste over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
 msgid "Unfreeze"
-msgstr ""
+msgstr "Lås opp"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
-msgstr ""
+msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
@@ -3510,4 +3592,6 @@
 "<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
 msgstr ""
+"<html>Trykk <strong>{0}</strong> for å begynne sammenslåingen av lokal- og "
+"tjeneroppføringer</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
@@ -3517,4 +3601,6 @@
 "html>"
 msgstr ""
+"<html>Trykk <strong>{0}</strong> for å avslutte sammenslåingen av lokal- og "
+"tjeneroppføringer</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
@@ -3522,6 +3608,6 @@
 msgid "My version ({0} entry)"
 msgid_plural "My version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lokal versjon ({0} oppføring)"
+msgstr[1] "Lokal versjon ({0} oppføringer)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
@@ -3529,6 +3615,6 @@
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sammenslått versjon ({0} oppføring)"
+msgstr[1] "Sammenslått versjon ({0} oppføringer)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
@@ -3536,6 +3622,6 @@
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tjenerens versjon ({0} oppføring)"
+msgstr[1] "Tjenerens versjon ({0} oppføringer)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
@@ -3556,9 +3642,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
-msgstr ""
+msgstr "parameter «{0}» må ha en verdi"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3566,17 +3656,20 @@
 "adjustment"
 msgstr ""
+"Justering {0} er ikke registrert ennå. Kan ikke sette deltakelse i "
+"synkronisert justering."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
-msgstr ""
+msgstr "Justering {0} er ikke regitrert ennå."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
 msgid "Node"
-msgstr ""
+msgstr "Node"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
-msgstr ""
+msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #. should not happen
@@ -3584,5 +3677,5 @@
 #, java-format
 msgid "unexpected column index. Got {0}"
-msgstr ""
+msgstr "Uventet kolonneindeks: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
@@ -3592,19 +3685,20 @@
 "html>"
 msgstr ""
+"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: {0}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Tilkobling mislykkes"
+msgstr "Kommunikasjon med tjener feilet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
 msgid "Yes, undelete them too"
-msgstr ""
+msgstr "Ja, gjenopprett også dem"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
 msgid "No, cancel operation"
-msgstr ""
+msgstr "Nei, avbryt operasjonen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
@@ -3614,8 +3708,10 @@
 "the server.<br><br>Do you want to undelete these nodes too?</html>"
 msgstr ""
+"<html>Ytterligere {0} noder i bruk av linje {1},<br>er slettet på tjeneren."
+"<br><br>Vil du gjenopprette også disse nodene?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
 msgid "Undelete additional nodes?"
-msgstr ""
+msgstr "Gjenopprette ytterligere noder?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
@@ -3626,12 +3722,14 @@
 "</html>"
 msgstr ""
+"<html>Ytterligere {0} objekter med henvisninger i relasjon {1},<br>er "
+"slettet på tjeneren.<br><br>Vil du gjenopprette også dem?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
 msgid "Undelete dependent primitives?"
-msgstr ""
+msgstr "Gjenopprette avhengige objekter?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
 msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Egenskaper i det lokate datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
@@ -3640,20 +3738,22 @@
 "elements when merge decisions are applied."
 msgstr ""
+"Egenskaper i det sammenslåtte elementet. De vil erstatte egenskaper i lokale "
+"elementer når sammenslåingsvalgene tas i bruk."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Egenskaper i tjenerens datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
 msgid "Coordinates:"
-msgstr ""
+msgstr "Koordinater:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
 msgid "Deleted State:"
-msgstr ""
+msgstr "Slettestatus:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
 msgid "Visible State:"
-msgstr ""
+msgstr "Synlighetsstatus:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
@@ -3671,60 +3771,58 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
 msgid "not deleted"
-msgstr ""
+msgstr "ikke slettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
 msgid "visible (on the server)"
-msgstr ""
+msgstr "synlig (på tjeneren)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
 msgid "not visible (on the server)"
-msgstr ""
+msgstr "ikke synlig (på tjeneren)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Tast inn et navn for stedet."
+msgstr "Behold en klone av den lokale versjonen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
 msgid "Physically delete from local dataset"
-msgstr ""
+msgstr "Slett fra det lokale datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
 msgid "Keep my coordiates"
-msgstr ""
+msgstr "Behold lokale koordinater"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
 msgid "Keep their coordiates"
-msgstr ""
+msgstr "Behold tjenerens koordinater"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
 msgid "Undecide conflict between different coordinates"
-msgstr ""
+msgstr "Fjern avgjørelse fra koordinatkonflikt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
 msgid "Keep my deleted state"
-msgstr ""
+msgstr "Behold lokal slettestatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
 msgid "Keep their deleted state"
-msgstr ""
+msgstr "Behold tjenerens slettestatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
 msgid "Undecide conflict between deleted state"
-msgstr ""
+msgstr "Fjern avgjørelse fra slettekonflikt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
 msgid "Keep my visible state"
-msgstr ""
+msgstr "Behold lokal synlighetsstatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
 msgid "Yes, reset the id"
-msgstr ""
+msgstr "Ja, nullstill ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Ingen dato"
+msgstr "Nei, avbryt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3735,16 +3833,19 @@
 "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/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Nullstill ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
-msgstr ""
+msgstr "Behold tjenerens synlighetsstatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Ja, rydd ut objektet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3754,28 +3855,31 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM må fjerne lokalt element med ID {0} fra datasettet.<br>Er dette "
+"OK?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "fjern fra utvalg"
+msgstr "Fjern fra datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
 msgid "Undecide conflict between visible state"
-msgstr ""
+msgstr "Fjern avgjørelse fra visningskonflikt"
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rolle"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
-msgstr ""
+msgstr "Objekt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
 msgid "merged nodes not frozen yet. Can't build resolution command"
-msgstr ""
+msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
@@ -3787,6 +3891,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
-msgstr ""
+msgstr "<ikke angitt>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
@@ -3796,5 +3902,5 @@
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr ""
+msgstr "Sammeslått datasett vil ikke inneholde en egenskap med nøkkel {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
@@ -3802,5 +3908,5 @@
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Lokalt datasett inneholder ikke en egenskap med nøkkel {0}"
 
 #. setting up the properties table
@@ -3808,8 +3914,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3820,7 +3926,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3831,5 +3938,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
 msgid "cannot apply undecided tag merge item"
-msgstr ""
+msgstr "Kan ikke bruke uavgjort sammenslåing for egenskap"
 
 #. should not happen, but just in case
@@ -3837,34 +3944,34 @@
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
-msgstr ""
+msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
 msgid "My version (local dataset)"
-msgstr ""
+msgstr "Lokalt datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
-msgstr ""
+msgstr "Tjenerens datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
-msgstr ""
+msgstr "Behold valgte nøkkel–verdi-par fra det lokale datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
-msgstr ""
+msgstr "Behold valgte nøkkel–verdi-par fra tjenerens datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
 msgid "Undecide"
-msgstr ""
+msgstr "Fjern avgjørelse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
-msgstr ""
+msgstr "Fjerner avgjørelse fra valgte egenskaper"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
@@ -3872,9 +3979,9 @@
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Kommandoliste"
@@ -3885,6 +3992,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3895,5 +4002,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../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:74
@@ -3902,10 +4009,27 @@
 msgstr "Slå av/på: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Kommandoliste: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Konflikter ved sammenføyning."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Løs"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Åpne en dialog for å sammenføye element i lista ovenfor."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3914,49 +4038,27 @@
 msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Løs"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Åpne en dialog for å sammenføye element i lista ovenfor."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Konflikter ved sammenføyning."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konflikter: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
-msgstr ""
+msgstr "Løs konflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
 msgid "Cancel conflict resolution and close the dialog"
-msgstr ""
+msgstr "Avbryt konfliktløsning og lukk vinduet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
 msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
+msgstr "Ta i bruk løste konflikter og lukk vinduet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
 msgid "Apply Resolution"
-msgstr ""
+msgstr "Bruk løsninger"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
 msgid "Apply partial resolutions"
-msgstr ""
+msgstr "Bruk ufullstendige løsninger"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
 msgid "Continue resolving"
-msgstr ""
+msgstr "Fortsett å løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
@@ -3968,45 +4070,54 @@
 "resolving conflicts.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Oppfrisk liste - Klikk Reload"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+"<html>Du har ikke løst alle konfliktene ennå.<br>Trykk <strong>{0}</strong> "
+"for å ta i bruk allerede løste konflikter likevel.<br>Du kan løse "
+"gjenværende konflikter senere.<br>Trykk <strong>{1}</strong> for å fortsette "
+"å løse konflikter.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historikk"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Vis historikk på alle valgte objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Dato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+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>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "Indeks er utenfor rekkevidde: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr "Historikkobjekt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "Last historikk"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Laster historikk for {0} med ID {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Les inn og oppfrisk liste over alle valgte objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Tilbakestill"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Tilbakestill status på alle valgte objekt til versjon som valgt i historikk."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Ikke implementert enda."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Vis"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr "Vis historikken for det valgte objektet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4139,4 +4250,18 @@
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Legg til"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4249,14 +4374,14 @@
 msgstr "Utvalg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Frigjør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klikk for at minimere/maksimere panelet"
@@ -4286,181 +4411,104 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Utfør endringer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Enkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Brukt av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "koblet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Egenskaper (tom verdi fjerner egenskap)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Flytt opp"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Flytt valgte medlem opp"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Legg til utvalgte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Tilføy alle valgte objekt som medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Fjern Utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Fjern alle valgte objekt fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Slett den valgte kilden fra lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Flytt ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Flytt valgt medlem ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Last ned medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
-msgstr "Last ned alle ufullstændige linjer og noder i relasjonen"
-
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nei"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+msgstr "Last ned alle ufullstendige linjer og noder i relasjonen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Medlemmer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relasjons-editor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Det var konflikter ved import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
-msgstr "Feil i oversendelse av server respons."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+msgstr "Klarte ikke lese tjenerrespons."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
-msgstr "Kan ikke koble til serveren."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+msgstr "Klarte ikke koble til tjeneren."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
-msgstr ""
+msgstr "Klarte ikke kommunisere med tjener."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:67
@@ -4493,21 +4541,21 @@
 msgstr "Velg først et bokmerke"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "maks. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "maks. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4517,5 +4565,5 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Yttergrense for arbeidsområde"
@@ -4536,10 +4584,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
 msgid "Download area too large; will probably be rejected by server"
-msgstr "Området er for stort; vil sandsynligvis bli avvist av server"
+msgstr "Området er for stort; vil sandsynligvis bli avvist av tjener"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
-"Områdets størrelse ok, størrelsen vil sannsynligvis aksepteres av server"
+"Områdets størrelse OK, størrelsen vil sannsynligvis aksepteres av tjener"
 
 #. SAXException does not chain correctly
@@ -4554,5 +4602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186
 msgid "Cannot read place search results from server"
-msgstr "Kan ikke lese søkeresultat om sted fra server"
+msgstr "Klarte ikke lese søkeresultat om sted fra tjener"
 
 #. this is manually tuned so that it looks nice on a GNOME
@@ -4665,679 +4713,45 @@
 msgstr "Flis-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Bilder for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Les GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Ingen tid gitt for punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kan ikke læse tid \"{0}\" for punkt {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Ingen bilder med lesbare tidsstempler funnet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Leser {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geotaggede bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS-slutt: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nåværende forskjell: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "tidssone-forskjell: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "bilde"
-msgstr[1] "bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} innenfor sporet."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Synkronisér klokke"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-bilder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datoen i filen \"{0}\" kunne ikke tolkes."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Det er ikke EXIF-tidspunkt i fila \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Bilde"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS-enhetens tidssone (forskjell fra foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synkronisér tidspunkt med GPS-enhet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Den indtastede tid kunne ikke tolkes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps-punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Tilpass linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Bruk globale indstillinger."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "Tegn linjer mellem punkter i dette laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "Tegn ikke linjer mellem punkt i dette laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Velg linjetegnings-innstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Tilpass farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Velg en farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Markører fra navngitte punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Navngivne sporpunkt fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importer lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Lyd-markører fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importer bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} spor, "
-msgstr[1] "{0} spor, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rute, "
-msgstr[1] "{0} ruter, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Tidshorisont: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Lengde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Konverter til datalag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "Historikk for {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Lukk vinduet"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
 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/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Konvertert fra: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Last ned fra OSM langs dette spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Last ned alt innenfor:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Max areal per forespørsel:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
 msgstr ""
-"<html>Fenne handling krever {0} individuelle<br>download-forespørsler. "
-"Ønsker du<br>å fortsette?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
+"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i "
+"historikken."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
 msgstr ""
-"Noen waypoints med tidskode før start av track eller etter slutt av track "
-"ble utelatt eller flyttet til start."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Noen waypoints som var langt fra track til å finne fornuftig plassering ble "
-"utelatt."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "utenfor nedlastet område"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "versjon {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} består av:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} slettet.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "ikke satt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "API versjon: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Konvertér til GPX-lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "GPS spor"
-msgstr[1] "GPS spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punkt"
-msgstr[1] "punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "et GPS spor med {0} punkt"
-msgstr[1] "et GPS spor med {0} punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} består av {1} GPS spor"
-msgstr[1] "{0} består av {1} GPS spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "GPS-flagg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "flagg"
-msgstr[1] "flagg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} består av {1} flagg"
-msgstr[1] "{0} består av {1} flagg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synkroniser lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr "Du må sætte lyden på pause når du hører synkroniserings-merket."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Lyd synkronisert i punkt {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "Kan ikke synkronisere i det avspillte lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Sett audio-merke ved avspilnings-start"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "Du må  pause lyden på det punkt på sporet, hvor du vil ha merket."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Ingen eksisterende lydmerker i dette lag å forskyve."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"Dru må dra og slippe avspillingsmarkøren til GPX track hvor lydfila tilhører "
-"(etter første markør)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Dru må SHIFT-dra og slippe avspillingsmarkøren til lydmerke eller til punkt "
-"i track for synkronisering."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Kan ikke sette ny audio-markør"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Der opstod en feil i forsøket på å vise URL'en for denne markøren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL var: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Feil ved visning av URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Avanserte innstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Endre innstillingerne direkte. Vær varsom!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Søk: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Nåværende verdi er standard."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Standardverdien er \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Standardverdien er i øyeblikket ukjent (indstillingen har ikke vært i brug "
-"enda)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Velg raden som skal endres"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Ny verdi for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Velg raden som skal slettes"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Gi en ny nøkkel med verdi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Vis lyd-menyen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Navnsett lyd- (og bilde- og web-)markører."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Vis live lydspor."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Opprett markører uten lyd når GPX-data leses."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Separate waypoints med gyldig tidskode."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Separate waypoints med tid estimert fra posisjon i track."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Trackpoints med navn."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Endrede tidsmarker (time stamps) i audio filer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Start på track (Blir alltid utført dersom dersom andre merker ikke er "
-"tilgjengelig)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Vis eller skjul lydmeny-punktet i hovedmenyen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Vis et bevegelig  icon som viser hvor på GPS track du er når lyde er "
-"innspilt."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Sett tekst på lydspor (og bilde og web) merker sammen med knappe ikoner."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Når lyd importeres, opret markører fra..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Når lyd importeres, tilknyt den til ethvert waypoint i GPX-laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Lag automatisk lydmerker fra punkt i track (heller enn egne waypoints)med "
-"navn eller beskrivelse."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Lag audio merker på posisjon på GPS  track som stemmer med tidskoden på "
-"importert  WAV fil."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Antall sekunder for forover eller bakover hopp ved trykk på aktuell knapp"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Forover/bakover tid (sekunder)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Multiplikasjon benyttet ved fast forward"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Rask avspilling multiplikator"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Avspilling starter med dette antall sekunder før (eller etter når negativ) "
-"posisjon for lydsporet."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Tid på innledning (sekunder)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr "Forholdet mellom stemme recorder tid og sann tid"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Stemme  recorder kalibrering"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Farge"
+"Klarte ikke sette gjeldende versjon. Gjeldende versjon {0} er ikke "
+"tilgjengelig i historikken."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Node {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6047,5 +5461,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6196,40 +5611,742 @@
 msgstr "Navn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Versjon <strong>{0}</strong> lagt til <strong>{1}</strong> av <strong>"
+"{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Versjon {0} lagt til {1} av {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Versjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Les GPX …"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Ingen tid gitt for punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Ingen bilder med lesbare tidsstempler funnet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Leser {0} …"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geotaggede bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS-slutt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nåværende forskjell: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "tidssone-forskjell: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "bilde"
+msgstr[1] "bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} innenfor sporet."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Synkronisér klokke"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-bilder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Klarte ikke tolke datoen i fila «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Bilde"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS-enhetens tidssone (forskjell fra foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synkronisér tidspunkt med GPS-enhet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Den indtastede tid kunne ikke tolkes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps-punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Tilpass linjetegning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Bruk globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "Tegn linjer mellem punkter i dette laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "Tegn ikke linjer mellem punkt i dette laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Velg linjetegnings-innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Tilpass farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Velg en farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Markører fra navngitte punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Navngivne sporpunkt fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importer lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Lyd-markører fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importer bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} spor, "
+msgstr[1] "{0} spor, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rute, "
+msgstr[1] "{0} ruter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Tidshorisont: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Lengde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Konverter til datalag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+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/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Konvertert fra: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Last ned fra OSM langs dette spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Last ned alt innenfor:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Max areal per forespørsel:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Fenne handling krever {0} individuelle<br>download-forespørsler. "
+"Ønsker du<br>å fortsette?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Noen waypoints med tidskode før start av track eller etter slutt av track "
+"ble utelatt eller flyttet til start."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Noen waypoints som var langt fra track til å finne fornuftig plassering ble "
+"utelatt."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datalag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "utenfor nedlastet område"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "versjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Det oppstod {0} konflikter under import."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} består av:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} slettet.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "ikke satt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API versjon: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Konvertér til GPX-lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "GPS spor"
+msgstr[1] "GPS spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punkt"
+msgstr[1] "punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "et GPS spor med {0} punkt"
+msgstr[1] "et GPS spor med {0} punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} består av {1} GPS spor"
+msgstr[1] "{0} består av {1} GPS spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "GPS-flagg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "flagg"
+msgstr[1] "flagg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} består av {1} flagg"
+msgstr[1] "{0} består av {1} flagg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synkroniser lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr "Du må sætte lyden på pause når du hører synkroniserings-merket."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Lyd synkronisert i punkt {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr "Kan ikke synkronisere i det avspillte lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Sett audio-merke ved avspilnings-start"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "Du må  pause lyden på det punkt på sporet, hvor du vil ha merket."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Ingen eksisterende lydmerker i dette lag å forskyve."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Dru må dra og slippe avspillingsmarkøren til GPX track hvor lydfila tilhører "
+"(etter første markør)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Dru må SHIFT-dra og slippe avspillingsmarkøren til lydmerke eller til punkt "
+"i track for synkronisering."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Kan ikke sette ny audio-markør"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Der opstod en feil i forsøket på å vise URL'en for denne markøren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL var: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Feil ved visning av URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Avanserte innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Endre innstillingerne direkte. Vær varsom!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Søk: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Nåværende verdi er standard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Standardverdien er «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Standardverdien er i øyeblikket ukjent (indstillingen har ikke vært i brug "
+"enda)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Velg raden som skal endres"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Ny verdi for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Velg raden som skal slettes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Gi en ny nøkkel med verdi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Vis lyd-menyen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Navnsett lyd- (og bilde- og web-)markører."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Vis live lydspor."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Opprett markører uten lyd når GPX-data leses."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Separate waypoints med gyldig tidskode."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Separate waypoints med tid estimert fra posisjon i track."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Trackpoints med navn."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Endrede tidsmarker (time stamps) i audio filer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+"Start på track (Blir alltid utført dersom dersom andre merker ikke er "
+"tilgjengelig)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Vis eller skjul lydmeny-punktet i hovedmenyen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Vis et bevegelig  icon som viser hvor på GPS track du er når lyde er "
+"innspilt."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Sett tekst på lydspor (og bilde og web) merker sammen med knappe ikoner."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Når lyd importeres, opprett markører fra  …"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Når lyd importeres, tilknyt den til ethvert waypoint i GPX-laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Lag automatisk lydmerker fra punkt i track (heller enn egne waypoints)med "
+"navn eller beskrivelse."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Lag audio merker på posisjon på GPS  track som stemmer med tidskoden på "
+"importert  WAV fil."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Antall sekunder for forover eller bakover hopp ved trykk på aktuell knapp"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Forover/bakover tid (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "Multiplikasjon benyttet ved fast forward"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Rask avspilling multiplikator"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Avspilling starter med dette antall sekunder før (eller etter når negativ) "
+"posisjon for lydsporet."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Tid på innledning (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "Forholdet mellom stemme recorder tid og sann tid"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Stemme  recorder kalibrering"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
-msgstr "Tegne style {0}: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+msgstr "Tegnestil {0}: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Lag: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Velg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Velg en farge for {0}g"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
-msgstr "Sett til standardk"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+msgstr "Sett til standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Sett alt til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Farger brukt av forskellige objekt i JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Farger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6238,29 +6355,29 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Tegn linjer selv om ingen segmenter ble importert."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet  (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (rød = bra, green = dårlig (hvis noen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "En farge (kan tilpasses navngitte lag)"
@@ -6268,5 +6385,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6287,5 +6404,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6323,5 +6440,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6334,50 +6451,50 @@
 msgstr "Til fots"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspiler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
-msgstr "Hurtig optegning (ser uryddig ut)"
+msgstr "Hurtig opptegning (ser uryddig ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Bare ved enden af linjen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Tegn segment-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af nedlastede data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle noder i utvalg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i annen farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glatting på kartgrafikk (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6386,9 +6503,9 @@
 "Max lengde (i meter) for å tegne linjer i lokal fil. '-1' tegner alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -6397,10 +6514,10 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6408,10 +6525,10 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6419,5 +6536,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6425,13 +6542,13 @@
 msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6441,9 +6558,9 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Punkt og track linjer får farge etter hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6453,136 +6570,157 @@
 "GPS kan logge dette."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillater å justere fargen etter forskjellig gjennomsnitt hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
-msgstr "Tegn retnings piler på linjestykker."
+msgstr "Tegn retningspiler på linjestykker."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
-msgstr "Sett nummers på alle segment i en linje"
+msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
-msgstr "Tegn omrisset av data hentet fra serveren."
+msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Tegn virtuelle punkter i utvalget for lettere tilpasninger av linjer."
+msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en annen farge."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
-msgstr "Behold backup-filer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+msgstr "Behold sikkerhetskopier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
-msgstr "Lagre backup-filer med ~ i slutten av filnavnet."
+msgstr "Lagre sikkerhetskopier med ~ i slutten av filnavnet."
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Vis oppstartsskjerm"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Vis objekt-ID i lister"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
-msgstr "Tegn elastisk-hjelpelinje"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+msgstr "Tegn elastisk hjelpelinje"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
-msgstr "Arbeide uten ned- og opplasting (Potlatch metode)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+msgstr "Arbeide uten ned- og opplasting (Potlatch-metode)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
-msgstr "Ikke behov for å bytte modus. (potlatch metode)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
+msgstr "Ikke behov for å bytte modus. (Potlatch-metode)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Utseende og opplevelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Standard (automatisk valgt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Benytt innebygd standardverdier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Benytt innebygd standardverdier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Løypetype"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Indstil tilgængelige programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Last ned liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
-msgstr "Indstilling på sites..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+msgstr "Sett opp nettsteder …"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+msgstr "Legg til URL for liste over programtillegg."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Velg en verdi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+msgstr "Rediger URL for liste over programtillegg."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Indstilling på programtillegg sider"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Visningsinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6592,81 +6730,81 @@
 "prorammet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Innstillinger for tilkobling"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
-msgstr "Innstillinger for forbindelse til OSM-serveren"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgstr "Innstillinger for forbindelse til OSM-tjeneren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Innstillinger for kart"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Innstilinger for kartprojeksjon og datafortolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Lydinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Innstillinger for avspilling av lyd og lyd markering."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Vis koordinater som"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projeksjonsmetode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Kartprojeksjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projeksjonsmetode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Vis koordinater som"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
-msgstr "Aktiver proxy server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+msgstr "Bruk proxy-tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Proxy Innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
-msgstr "Proxy server vert"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+msgstr "Proxy-tjenerens vert"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
-msgstr "Proxy server port"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+msgstr "Proxy-tjenerens port"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
-msgstr "Proxy server brukernavn"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+msgstr "Brukernavn for proxy-tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
-msgstr "Proxy server passord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+msgstr "Passord for proxy-tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
-msgstr "Web adressen for OSM server (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+msgstr "URL-adressen for OSM-tjeneren (REST API)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+msgstr "E-postadresse for OSM-kontoen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6675,17 +6813,17 @@
 "noen passord."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
-msgstr "Web adressen til server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+msgstr "URL-adresse til tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+msgstr "OSM-brukernavn (e-post)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM passord"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6693,4 +6831,7 @@
 "URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
+"<html>Advarsel: Passordet lagres i ren tekst i innstillingsfila."
+"<br>Passordet overføres i ren tekst til tjeneren som del av URL-adressen."
+"<br><b>Ikke bruk et verdifullt passord.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6700,77 +6841,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
-msgstr "Innstilling for snarveier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+msgstr "Innstillinger for snarveier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Bytt tastatursnarvei manuelt."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Handling"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
-msgstr "Snarvei"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+msgstr "Hurtigtast"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Lag: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Opphavsmenn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Hjelp: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Kopier Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Velg raden du vil kopiere."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Tilføy en ny kilde til lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Slett den valgte kilden fra lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Meny for sortering av innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Benytt innebygd standardverdier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Innstilling av Objektmaler"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Kilden (URL eller filnavn) på definisjonsfiler for Objektmaler. Se http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Legg til ny Objektmal instilling i lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Slett den valgte kilden fra lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Objektmal kilde"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Skilletegn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Verktøylinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Tilpass verktøylinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Tilpass element i verktøylinja"
@@ -6786,5 +6958,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:164
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
-msgstr "<h1><a name=\"top\">Tastatur snarvei</a></h1>"
+msgstr "<h1><a name=\"top\">Tastatursnarveier</a></h1>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:165
@@ -6887,5 +7059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:254
 msgid "Edit Shortcuts"
-msgstr "Rediger Snarveier"
+msgstr "Rediger snarveier"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:257
@@ -6938,10 +7110,10 @@
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Bruk Objektmal''{0}'' i gruppa ''{1}''"
+msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
 #, java-format
 msgid "Use preset ''{0}''"
-msgstr "Bruk Objektmal ''{0}''"
+msgstr "Bruk objektmal «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
@@ -7001,5 +7173,5 @@
 #, java-format
 msgid "Preset group ''{0}''"
-msgstr "Objektmal  gruppe ''{0}''"
+msgstr "Objektmalgruppe «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
@@ -7008,10 +7180,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37
 msgid "Contacting OSM Server..."
-msgstr "Kontakter OSM-serveren..."
+msgstr "Kontakter OSM-tjeneren …"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
 #, java-format
 msgid "Downloading points {0} to {1}..."
-msgstr "Henter punkt {0} til {1}..."
+msgstr "Laster ned punkt {0} til {1}..."
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
@@ -7021,5 +7193,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
 msgid "Downloading OSM data..."
-msgstr "Laster ned OSM data..."
+msgstr "Laster ned OSM-data …"
 
 #. SAXException does not chain correctly
@@ -7031,5 +7203,5 @@
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
-msgstr "Klargjør data..."
+msgstr "Klargjør data …"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
@@ -7040,6 +7212,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../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:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7050,5 +7222,5 @@
 #, java-format
 msgid "File \"{0}\" does not exist"
-msgstr ""
+msgstr "Fila «{0}» finnes ikke"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7056,5 +7228,5 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Klarte ikke lese fil «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -7066,9 +7238,10 @@
 msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
 msgstr ""
+"Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "Tjeneren svarte med HTTP 404 for ID {0} – hopper over."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
@@ -7077,4 +7250,6 @@
 "for each primitive"
 msgstr ""
+"Tjeneren svarte med HTTP 404, prøver igjen med en forespørsel for hvert "
+"element."
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -7115,9 +7290,9 @@
 #, java-format
 msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-msgstr ""
+msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171
 msgid "This version of JOSM is incompatible with the configured server."
-msgstr "Denne versjon av JOSM kan ikke lese fra serveren."
+msgstr "Denne versjonen av JOSM kan ikke lese fra tjeneren."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
@@ -7127,5 +7302,5 @@
 "{0} to {1}."
 msgstr ""
-"Den støtter protocol versjon 0.5 og 0.6, men serveren støtter {0} til {1}."
+"Den støtter protokollversjon 0.5 og 0.6, mens tjeneren støtter {0} til {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176
@@ -7137,5 +7312,5 @@
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
-msgstr ""
+msgstr "Uventet ID-format i svar fra tjener – leste «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260
@@ -7143,13 +7318,13 @@
 msgid ""
 "unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
-msgstr ""
+msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283
 msgid "Opening changeset..."
-msgstr "Åpner basen med rettinger.."
+msgstr "Åpner endringssett …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
-msgstr "Lukker basen med rettinger..."
+msgstr "Lukker endringssett …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
@@ -7159,18 +7334,18 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
 msgid "Preparing..."
-msgstr "Forbereder..."
+msgstr "Forbereder …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 msgid "Uploading..."
-msgstr "Laster opp..."
+msgstr "Laster opp …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
-msgstr ""
+msgstr "OSM-tjenerfiler bzip2-komprimert"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31
 msgid "Invalid bz2 file."
-msgstr ""
+msgstr "Ugyldig bzip2-fil"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
@@ -7197,9 +7372,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
-msgstr "Avbryter..."
+msgstr "Avbryter …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
-msgstr ""
+msgstr "OSM-tjenerfiler gzip-komprimert"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
@@ -7209,5 +7384,5 @@
 #, java-format
 msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
+msgstr "obligatorisk attributt «{0}» mangler"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
@@ -7215,4 +7390,5 @@
 msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «long» – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
@@ -7221,4 +7397,6 @@
 "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «long» (>= 0) – leste "
+"«{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
@@ -7226,4 +7404,5 @@
 msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
@@ -7232,4 +7411,6 @@
 "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – leste "
+"«{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
@@ -7238,4 +7419,5 @@
 "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
@@ -7245,4 +7427,6 @@
 "''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» – "
+"leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
@@ -7252,5 +7436,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
 msgid "OSM Server Files"
-msgstr "OSM server filer"
+msgstr "OSM-tjenerfiler"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
@@ -7282,5 +7466,5 @@
 #, java-format
 msgid "Missing attribute \"ref\" on member in relation {0}"
-msgstr ""
+msgstr "Mangler attributt «ref» for medlem av relasjon {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
@@ -7288,14 +7472,15 @@
 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:235
 #, java-format
 msgid "Missing attribute \"type\" on member {0} in relation {1}"
-msgstr ""
+msgstr "Mangler attributt «type» for medlem {0} i relasjon {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
 #, java-format
 msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-msgstr ""
+msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
@@ -7312,14 +7497,15 @@
 "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:321
 #, java-format
 msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-msgstr ""
+msgstr "Mangler attributt «version» for OSM-element med ID {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
 #, java-format
 msgid "Missing required attribute \"{0}\"."
-msgstr "Mangler obligatorisk attributt \"{0}\"."
+msgstr "Mangler obligatorisk attributt «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
@@ -7330,5 +7516,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
 msgid "Prepare OSM data..."
-msgstr "Klargjør OSM data..."
+msgstr "Klargjør OSM-data …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
@@ -7339,18 +7525,18 @@
 #, java-format
 msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-msgstr ""
+msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
 msgid "Downloading history..."
-msgstr ""
+msgstr "Laster ned historikk …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
 msgid "Contacting Server..."
-msgstr "Kobler opp Server..."
+msgstr "Kobler til tjener …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58
 #, java-format
 msgid "Failed to open connection to API {0}"
-msgstr ""
+msgstr "Klarte ikke åpne tilkobling til API {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
@@ -7358,13 +7544,14 @@
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr ""
-"Kunne ikke koble til OSM server. Vennligst kontroller internett tilkoblingen "
-"din."
+"Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
+"Advarsel: Innstilling «{0}» eller API-versjon «{1}» i datasettet krever bruk "
+"av endringssett, men API kan ikke håndtere dem. Ignorerer endringssett."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
@@ -7373,15 +7560,15 @@
 msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Opdater programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Last ned Programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7394,32 +7581,32 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
 msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+msgstr[0] "{0} programtillegg lastet ned. Start JOSM på nytt."
+msgstr[1] "{0} programtillegg lastet ned. Start JOSM på nytt."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr ""
+msgstr "Laster ned programtillegg {0} …"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr "Hopp over nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
-msgstr ""
+#, 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:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+msgstr "Last ned programtillegg"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
-msgstr ""
+msgstr "Hopp over nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -7434,5 +7621,5 @@
 "required."
 msgstr ""
-"ADVARSEL - Programtillegget {0} skulle lastes inn, men det er ikke lenger "
+"Advarsel – programtillegget {0} skulle lastes inn, men det er ikke lenger "
 "behov for det."
 
@@ -7440,5 +7627,5 @@
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
-msgstr ""
+msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94
@@ -7468,6 +7655,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Fjern programtillegg"
@@ -7482,5 +7669,5 @@
 msgstr "Behold programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7490,16 +7677,16 @@
 "skrive over eksisterende."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr "En uventet feil opstod som kan stamme fra programtillegget \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, 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:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7507,9 +7694,9 @@
 "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Skal programtillegget fjernes?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7519,5 +7706,5 @@
 "lese programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7526,34 +7713,34 @@
 "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "ingen beskrivelse tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Flere detaljer"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
 msgid_plural "Downloaded plugin information from {0} sites"
-msgstr[0] "Last ned info om programtillegg fra {0} server"
-msgstr[1] "Last ned info om programtillegg fra {0} servere"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+msgstr[0] "Lastet ned informasjon om programtillegg fra {0} tjener"
+msgstr[1] "Lastet ned informasjon om programtillegg fra {0} tjenere"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Fant ikke info om programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Alle installerte programtillegg er siste versjon."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7566,9 +7753,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Last ned programtillegg som mangler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7581,6 +7768,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7603,14 +7790,14 @@
 msgstr "ukjent"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versjon {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Programtillegg inkludert i JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7688,6 +7875,6 @@
 "\n"
 msgstr ""
-"Hurtigtasten kunne ikke settes ''{0}'' forhandlingen ''{1}'' ({2}) \n"
-"fordi  ''{3}'' ({4}) allerede benytter denne hurtigtasten.\n"
+"Klarte ikke sette hurtigtasten «{0}» for handlingen «{1}» ({2})\n"
+"fordi «{3}» ({4}) allerede benytter denne hurtigtasten.\n"
 "\n"
 
@@ -7706,5 +7893,5 @@
 "\n"
 msgstr ""
-"Bruk i stedet hurtigtasten ''{0}'' .\n"
+"Bruker i stedet hurtigtasten «{0}».\n"
 "\n"
 
@@ -7727,13 +7914,13 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr "Velg to linjer med en felles Node"
+msgstr "Velg to linjer med en felles node"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr "Velg to linjer med BARE EN felles Node"
+msgstr "Velg to linjer med kun én felles node"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
 msgid "Create a grid of ways"
-msgstr "Lag Rutenett med linjer"
+msgstr "Lag rutenett med linjer"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74
@@ -7778,5 +7965,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177
 msgid "Connecting..."
-msgstr "Kobler til..."
+msgstr "Kobler til …"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200
@@ -7794,5 +7981,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262
 msgid "Upload failed. Server returned the following message: "
-msgstr "Opplasting feilet. Server gav følgende svar: "
+msgstr "Klarte ikke laste opp. Tjeneren gav følgende svar: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
@@ -7828,5 +8015,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr "AgPifoJ - Geotagget  foto"
+msgstr "AgPifoJ – Geotaggede  bilder"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -7874,45 +8061,45 @@
 "{0} km/t"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Leser GPS posisjoner fra EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Starter scanning av mapper"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "En av de valgte filene var null (tom)!!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Les bilder"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Klarte ikke å lage fullstendig sti til mappa  {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanner mappa {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fant tom fil i mappa {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Feil ved lesing av fil i mappa {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7921,5 +8108,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 msgid "Open images with AgPifoJ..."
-msgstr "Åpne bilder med AgPifoJ..."
+msgstr "Åpne bilder med AgPifoJ …"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
@@ -7935,5 +8122,5 @@
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr "Fila {0} er lastet inn under navnet \"{1}\""
+msgstr "Fila {0} er lastet inn under navnet «{1}»"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
@@ -8120,34 +8307,36 @@
 msgstr "Sekunder: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, 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:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Tidsforskjell på {0} dager)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, 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:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
 msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+"Klarte ikke synkronisere bildene med GPX-sporet. Bruk glidebryterne for å "
+"synkronisere bildene manuelt."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Standardverdier"
@@ -8169,5 +8358,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
@@ -8206,5 +8395,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
 msgid "Choose from..."
-msgstr "Velg fra"
+msgstr "Velg fra …"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:292
@@ -8247,12 +8436,16 @@
 "Would you like to restore F11 for grab action ?"
 msgstr ""
+"Programtillegget cadastre-fr har tidligere brukt hurtigtasten F11 for å "
+"laste ned bilder.\n"
+"Denne tasten brukes nå for å endre fullskjermmodus som forvalg.\n"
+"Vil du gjenopprette bruken av F11 til å laste ned bilder?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "Restore grab shortcut F11"
-msgstr ""
+msgstr "Gjenopprett F11-hurtigtast"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid "JOSM is stopped for the change to take effect."
-msgstr ""
+msgstr "JOSM avsluttes for at endringen skal tre i kraft."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
@@ -8335,5 +8528,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
 msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr "Trekk et rektangel rundt data lastet ned fra  WMS server."
+msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener."
 
 #. the downloaded images multiplier
@@ -8379,5 +8572,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
 msgid "Contacting WMS Server..."
-msgstr "Kobler opp WMS Server..."
+msgstr "Kobler til WMS-tjener …"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
@@ -8400,9 +8593,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
-msgstr "Lag SVG ViewBox..."
+msgstr "Hent ut SVG-ViewBox …"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
-msgstr "Søk etter best passende avgrensing..."
+msgstr "Hent ut beste avgrensing …"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
@@ -8494,5 +8687,5 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Forenkle linje (fjern {0} Node)"
+msgstr[0] "Forenkle linje (fjern {0} node)"
 msgstr[1] "Forenkle linjer (fjern {0} noder)"
 
@@ -8504,5 +8697,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr ""
+msgstr "Juster posisjonen på WMS-laget (kun rasterbilder)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
@@ -8522,7 +8715,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
-msgstr "Blank ut lag"
+msgstr "Blankt lag"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
@@ -8566,4 +8759,5 @@
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
+"Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
@@ -8622,37 +8816,39 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS-filer (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "Formatfeil: "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "TangoGPS-data importert"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "Klarte ikke importere TangoGPS-data."
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Feil Fil Format"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA data er lest inn"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Feil ved import av NMEA data!"
+msgid "TCX Files (*.tcx)"
+msgstr "TangoGPS-filer (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
 msgid "Duplicate Way"
-msgstr "Dupliser linje"
+msgstr "Fordoble linje"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:76
 msgid "Duplicate selected ways."
-msgstr "Dupliser valgte linjer."
+msgstr "Fordoble valgte linjer."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
 msgid "Can't duplicate unordered way."
-msgstr "Kan ikke duplisere ukategorisert linje."
+msgstr "Kan ikke fordoble usortert linje."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
 msgid "You must select at least one way."
-msgstr "Du må velge minst en linje."
+msgstr "Du må velge minst én linje."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
@@ -8660,7 +8856,7 @@
 msgstr "Opprett kopi av linje"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
-msgstr "Lag for redigering av GPX spor"
+msgstr "Lag for redigering av GPX-spor"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
@@ -8670,5 +8866,5 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46
 msgid "edit gpx tracks"
-msgstr "Rediger GPX spor"
+msgstr "Rediger GPX-spor"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
@@ -8679,11 +8875,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importer spor fra GPX lag"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Slett eksisterende sti"
@@ -8692,6 +8888,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Fant ikke GPX lag"
@@ -8754,6 +8950,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Oppdater"
@@ -8789,5 +8985,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
 msgid "Importing data from DG100..."
-msgstr "Importerer data fra DG100..."
+msgstr "Importerer data fra DG100 …"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
@@ -8926,10 +9122,10 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
 msgid "Looking for shoreline..."
-msgstr "Søker etter kystlinje..."
+msgstr "Søker etter kystlinje …"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
 #, java-format
 msgid "{0} nodes so far..."
-msgstr "{0} noder til nå..."
+msgstr "{0} noder til nå …"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
@@ -8953,5 +9149,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
-msgstr "sjekker mellomlager..."
+msgstr "sjekker mellomlager …"
 
 #. *
@@ -8960,5 +9156,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
-msgstr "Reduserer antall punkt..."
+msgstr "Reduserer antall punkter …"
 
 #. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
@@ -8968,5 +9164,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
-msgstr "Kjører Douglas-Peucker tilnærming..."
+msgstr "Kjører Douglas-Peucker-tilnærming …"
 
 #. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
@@ -8976,5 +9172,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
-msgstr "Fjerner doble Noder"
+msgstr "Fjerner doble noder …"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
@@ -8985,5 +9181,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
 msgid "An unknown error has occurred"
-msgstr ""
+msgstr "Det oppstod en ukjent feil"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -9062,7 +9258,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "vann"
@@ -9082,9 +9278,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
 msgid "Maximum number of segments per way"
-msgstr "Max antal linjestykker pr linje"
+msgstr "Maksimalt antall segmenter per linje"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of nodes in initial trace"
-msgstr "Max antall Noder pr Vei"
+msgstr "Maksimalt antall noder i første opptegning"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
@@ -9118,5 +9314,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Tag ways as"
-msgstr "Egenskap på linje"
+msgstr "Egenskap for linjer"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
@@ -9134,10 +9330,10 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Source text"
-msgstr "Beskrivelse av Kilde"
+msgstr "Beskrivelse av kilde"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
-"Max antall linjesegment tillatt i hver genererte linje. Standard er 250."
+"Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
@@ -9207,5 +9403,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Data source text. Default is Landsat."
-msgstr "Data kilde beskrivelse. Standard: Landsat."
+msgstr "Beskrivelse av datakilde. Standard: Landsat."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
@@ -9219,5 +9415,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
 msgid "Downloading image tile..."
-msgstr "Laster ned bildefil"
+msgstr "Laster ned bildefil …"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
@@ -9259,5 +9455,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:52
 msgid "Way Info"
-msgstr "Linje Informasjon"
+msgstr "Linjeinformasjon"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:58
@@ -9281,5 +9477,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr "Koble til gpsd-server og vis nåværende posisjon i LiveGPS-lag"
+msgstr "Koble til gpsd-tjener og vis nåværende posisjon i LiveGPS-lag"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
@@ -9375,8 +9571,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>Openstreetbugs-tillegget bruker den gamle tjeneren på appspot.com."
+"<br>En ny tjener er tilgjengelig på schokokeks.org.<br>Vil du bytte til den "
+"nye tjeneren? (Anbefalt)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Bytte til ny openstreetbugs-tjener?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9403,14 +9602,14 @@
 msgstr "Header inneholder flere verdier og kan ikke kobles til enkelt streng"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Åpne OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+msgstr "Åpner OpenStreetBugs-vinduet og starter automatisk nedlasting"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9442,6 +9641,6 @@
 "comment:</html>"
 msgstr ""
-"<html>Ja, marker dette tema som ''done''?<br><br>Du kan legge inn "
-"tilleggskommentar:</html>"
+"<html>Vil du virkelig markere denne saken som ferdig?<br><br>Du kan legge "
+"inn tilleggskommentar:</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
@@ -9468,5 +9667,5 @@
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
 msgid "Open Visible..."
-msgstr "Åpne synlige..."
+msgstr "Åpne synlige …"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
@@ -9476,5 +9675,5 @@
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57
 msgid "No view open - cannot determine boundaries!"
-msgstr "Ingen arbeidsområde åpnet - kan ikke finne avgrensing!"
+msgstr "Ingen arbeidsområde åpnet – kan ikke finne avgrensing."
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110
@@ -9544,19 +9743,19 @@
 msgstr "Tillatte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Be om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Vil du tillate dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9629,5 +9828,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
 msgid "Highway type"
-msgstr "Riksvei Type"
+msgstr "Type ferdselsvei"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
@@ -9673,5 +9872,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Flush Tile Cache"
-msgstr ""
+msgstr "Tøm bildehurtiglager"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
@@ -9680,7 +9879,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Laster opp..."
+msgstr "laster bilde …"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9703,5 +9901,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
-msgstr "Kilde for kartbilder"
+msgstr "Kilder for kartbilder"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
@@ -9756,5 +9954,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-msgstr "Dupliser hurtigtast for knappen '{0}' - knappen blir ignorert!"
+msgstr "Dupliser hurtigtast for knappen «{0}» – knappen blir ignorert."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
@@ -9767,5 +9965,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr "Surveyor..."
+msgstr "Surveyor …"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -9855,5 +10053,5 @@
 #, java-format
 msgid "unexpected column number {0}"
-msgstr ""
+msgstr "Uventet kolonnenummer {0}"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -9874,13 +10072,4 @@
 msgstr "Du må først oppgi kilde for objektmaler."
 
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importer TCX Fil..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importer TCX fil som GPS spor"
-
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
 msgid "Reverse a terrace"
@@ -9910,5 +10099,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:130
 msgid "Select a single, closed way of at least four nodes."
-msgstr "Velg en enkelt lukket linje med minst fire Noder."
+msgstr "Velg én enkel lukket linje med minst fire noder."
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:199
@@ -10007,5 +10196,5 @@
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
-msgstr "\"{0}\" er ikke lukket, og kan derfor ikke være med i sammenføyning."
+msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
@@ -10016,7 +10205,7 @@
 "Are you really sure to continue?"
 msgstr ""
-"De valgtelinjene har Noder på utsiden av valgt dataområde.\n"
-"Dette kan medføre at Noder blir slettet ved uhell.\n"
-"Er du sikker på å fortsette?"
+"De valgte linjene har noder utenfor nedlastet dataområde.\n"
+"Dette kan medføre at noder blir slettet ved uhell.\n"
+"Er du sikker på at du vil fortsette?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
@@ -10027,9 +10216,9 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
 msgid "Please select at least one closed way the should be joined."
-msgstr "Velg minst en lukket linje å sammenføye med."
+msgstr "Velg minst én lukket linje å sammenføye med."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
 msgid "No intersection found. Nothing was changed."
-msgstr ""
+msgstr "Fant ingen skjæring. Ingen endringer ble gjort."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
@@ -10058,6 +10247,6 @@
 "verify no errors have been introduced."
 msgstr ""
-"Noen linjer er medlem i relasjoner som er endret. Vennligst bekreft at ingen "
-"feil er lagt inn."
+"Noen linjer er medlem i relasjoner som er endret. Sjekk at ingen feil har "
+"oppstått."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -10071,5 +10260,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
 msgid "Join Areas: Remove Short Ways"
-msgstr "Slå sammen areal: Fjern Korte linjer"
+msgstr "Slå sammen arealer: fjern korte linjer"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -10079,5 +10268,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
 msgid "Remove tags from inner ways"
-msgstr "Fjern egenskaper på linjer som er del av Relasjon (inner)"
+msgstr "Fjern egenskaper fra indre linjer"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
@@ -10093,33 +10282,33 @@
 msgstr "Åpner dialog som lar deg gå til bestemt posisjon"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Gi inn Lat/Lon for posisjon du vil gå til"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Du kan også lime inn URL fra www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (i meter)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Gå dit"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Gå til posisjon"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Kunne ikke tolke Lat / Lon"
@@ -10131,9 +10320,9 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Delete unnecessary nodes from a way."
-msgstr "Slett overflødige Noder fra linje."
+msgstr "Slett overflødige noder fra en linje."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82
 msgid "Please select at least one way to simplify."
-msgstr "Velg minst en linje å forenkle."
+msgstr "Velg minst én linje å forenkle."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
@@ -10142,6 +10331,6 @@
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr[0] "Utvalget har  {0} linje. Er du sikker du vil forenkle denne?"
-msgstr[1] "Utvalget har  {0} linjer. Er du sikker du vil forenkle disse?"
+msgstr[0] "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?"
+msgstr[1] "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -10243,5 +10432,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
 msgid "validation other"
-msgstr "validering - annet"
+msgstr "gyldighetssjekk – annet"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
@@ -10313,5 +10502,5 @@
 #, java-format
 msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr "Erstatt \"{0}\" med \"{1}\" for"
+msgstr "Erstatt «{0}» med «{1}» for"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
@@ -10354,5 +10543,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
 msgid "Duplicated way nodes."
-msgstr "Dobbelt-linjeoder"
+msgstr "Doble linjenoder."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -10362,5 +10551,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
 msgid "Duplicated way nodes"
-msgstr "Dobbelt-linjeNoder"
+msgstr "Doble linjenoder"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
@@ -10382,6 +10571,6 @@
 "than one way."
 msgstr ""
-"Denne testen sjekker at en forbindelse mellem to punkter ikke benyttes af "
-"mer enn en linje."
+"Denne testen sjekker at en forbindelse mellom to noder ikke benyttes av mer "
+"enn én linje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
@@ -10391,5 +10580,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
 msgid "Overlapping highways (with area)"
-msgstr "Overlappende riksveier (med område)"
+msgstr "Overlappende ferdselsveier (med område)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
@@ -10403,5 +10592,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
 msgid "Overlapping highways"
-msgstr "Overlappende riksveier"
+msgstr "Overlappende ferdselsveier"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
@@ -10421,5 +10610,5 @@
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr "Denne testen sjekker om Noder går igjen flere ganger i en linje."
+msgstr "Denne testen sjekker om noder går igjen flere ganger i en linje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
@@ -10433,23 +10622,23 @@
 msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Egenskapskontroll"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Denne programutvidelsen kontrollerer egenskapers nøkler og verdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "Ugyldig egenskapskontroll-linje - {0}: {1}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+msgstr "Ugyldig egenskapskontroll-linje – {0}: {1}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ugyldig stavekontroll linje: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10460,5 +10649,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Ulovlige kombinasjoner Egenskap / Verdi"
@@ -10466,78 +10655,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Problem med visning"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
-msgstr "Nøkkel \"{0}\" er ulovlig"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+msgstr "Nøkkel «{0}» er ugyldig."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Egenskaper uten verdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Ulovlig egenskapsnøkkel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Ulovlig mellomrom i Nøkkel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Egenskap Verdi starter eller slutter med mellomrom"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Egenskap Verdi inneholder HTML koding"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr "Nøkkelen \"{0}\" er ikke blant Objektmalene"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+msgstr "Nøkkel «{0}» finnes ikke i objektmalene"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Objektmalene inneholder ikke Nøkkelen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Verdien \"{0}\" for nøkkelen \"{1}\" finnes ikke i Objektmaler"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+msgstr "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Objektmalen har ikke Egenskapsverdi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Sjekk egenskabsnøkler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Bekreft at egenskabsnøklene kan sjekkes mot en ordliste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Bruk avansert egenskapskontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Kontroller egenskapsverdiene med hjelp av avanserte regler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Egenskapskontroll-kilde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10547,81 +10736,91 @@
 "org/index.php/User:JLS/speller) eller \"tag checking data files\"."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
-msgstr "Tilføy en ny kilde til listen."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+msgstr "Tilføy en ny kilde til lista."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Rediger valgt kilde."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Datakilder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Sjekk egenskapsverdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Bekreft at du vil sjekke egenskapsverdiene imot Objektmalene."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Se etter FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr "Søker etterNoder eller linjer med FIXME i en egenskapsverdi"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+msgstr "Søker etter noder eller linjer med FIXME i en egenskapsverdi"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Finn notater om tegning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Sjekk etter feil ved opptegning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Bruk standard datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Bruk standard datafil (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Bruk standard datafil."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Bruk standard datafil (anbefales)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Bruk standard fil for stavekontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Brug standard fil for stavekontroll (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Korriger egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Kunne ikke finne element-typen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Kunne ikke finne advarsels-niveå"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
-msgstr "Ugyldig uttrykk ''{0}''"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+msgstr "Ugyldig uttrykk «{0}»"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
-msgstr "Ugyldig regulært uttrykk \"{0}\""
+msgstr "Ugyldig regulært uttrykk «{0}»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
 msgid "Unclosed Ways."
-msgstr "Ikke lukket linje"
+msgstr "Ikke lukkede linjer."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
@@ -10642,5 +10841,5 @@
 #, java-format
 msgid "amenities type {0}"
-msgstr "Type bekvemligheter {0}"
+msgstr "fasilitetstype {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
@@ -10759,7 +10958,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "bygning"
@@ -10773,5 +10972,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "område"
@@ -10779,27 +10978,27 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
 msgid "Unclosed way"
-msgstr "Ikke Lukket linje"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+msgstr "Ikke lukket linje"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
-msgstr "Ikke knyttede linjer"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+msgstr "Ikke knyttede linjer."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Sjekker om en linje har endepunkt nesten inntil annen  linje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
-msgstr "Sluttnode i linje nær kjørevei"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+msgstr "Sluttnode nær annen ferdselsvei"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Sluttnode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
-msgstr "Linje Node nær annen linje"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+msgstr "Linjenode nær annen linje"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Knyttet endenode nær annen linje"
@@ -10812,37 +11011,42 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr "Sjekker for Noder uten egenskap som heller ikke tilhører noen linje"
+msgstr "Sjekker for noder uten egenskaper som heller ikke tilhører noen linje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:56
 msgid "Untagged, empty and one node ways."
-msgstr "Linjer med en Node, tomme eller uten egenskaper."
+msgstr "Linjer med én node, tomme eller uten egenskaper."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:57
 msgid "This test checks for untagged, empty and one node ways."
-msgstr "Finner linjer med en Node, som er tomme eller er uten egenskaper."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+msgstr "Finner linjer med én node, som er tomme eller er uten egenskaper."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Linjer uten navn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Rediger kryss"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Linjer uten egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Tomme linjer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
-msgstr "Linjer med bare en Node"
+msgstr "Linjer med bare én node"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
 msgid "Wrongly Ordered Ways."
-msgstr "Linjer med feil retning"
+msgstr "Linjer med feil retning."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "This test checks the direction of water, land and coastline ways."
-msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning"
+msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
@@ -10861,5 +11065,5 @@
 #, java-format
 msgid "{0}, ..."
-msgstr "{0}, ..."
+msgstr "{0}, …"
 
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
@@ -10868,16 +11072,16 @@
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92
 msgid "Select a starting node on the end of a way"
-msgstr ""
-
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+msgstr "Velg en startnode i enden av en linje"
+
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
-msgstr ""
+msgstr "Nådde slutten av linja"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+msgstr "Nådde et kryss"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Det oppsto en feil"
@@ -10917,4 +11121,27 @@
 "use."
 msgstr ""
+"Sie können WMS-Einträge in den WMSPlugin-Einstellungen hinzufügen, ändern "
+"und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
+"\n"
+"Sie können dies in den erweiterten Einstellungen auch manuell nach folgendem "
+"Schema erledigen:\n"
+"wmsplugin.url.1.name=LandSat\n"
+"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+"wmsplugin.url.2.name=NPE-Karten ...\n"
+"\n"
+"Die komplette LandSat-WMS-URL aus dem Beispiel ist:\n"
+"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg \n"
+"\n"
+"Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
+"muss nur die relevante ID eingegeben werden.\n"
+"Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
+"manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
+"Bild-ID):\n"
+"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+"\n"
+"Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich "
+"sind. Im Zweifel verzichten Sie auf die Nutzung."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
@@ -10925,5 +11152,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
 msgid "Rectified Image..."
-msgstr "Ortografisk korrekt bilde"
+msgstr "Ortografisk korrekt bilde …"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
@@ -10934,5 +11161,5 @@
 #, java-format
 msgid "WMS: {0}"
-msgstr ""
+msgstr "WMS: {0}"
 
 #. This service serves the purpose of "just this once" without forcing the user
@@ -10942,5 +11169,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
 msgid "Custom WMS Link"
-msgstr ""
+msgstr "Selvvalgt WMS-adresse"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
@@ -10950,9 +11177,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
 msgid "Visit Homepage"
-msgstr ""
+msgstr "Gå til hjemmeside"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
 msgid "WMS URL or Image ID:"
-msgstr ""
+msgstr "WMS-URL eller bilde-ID:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148
@@ -10969,5 +11196,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
 msgid "No valid WMS URL or id"
-msgstr ""
+msgstr "Ingen gyldig WMS-URL eller ID"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
@@ -10975,5 +11202,5 @@
 msgstr "Tilpass posisjon på valgt  WMS lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10981,5 +11208,5 @@
 "This may lead to wrong coordinates."
 msgstr ""
-"Kartprojeksjonen ''{0}'' i URL og valgt kartprojeksjon ''{1}'' passer ikke.\n"
+"Kartprojeksjonen «{0}» i URL og valgt kartprojeksjon «{1}» passer ikke.\n"
 "Dette resulterer i feil koordinater."
 
@@ -10988,117 +11215,106 @@
 msgstr "Automatisk nedlasting"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, 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:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 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:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgstr "Lagre WMS-lag"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+msgstr "Last inn WMS-lag"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, 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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 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:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Innstillinger WMS Programtillegg"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+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:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr "Rediger liste over WMS servere som vises i WMS programtillegg"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Meny Navn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Meny Navn (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Gi meny navn og WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Kopier Standard"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Velg raden du vil kopiere."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Overlapp kartbilder"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% av bredden:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% av lengden:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Last ned"
 
 #. *
@@ -11136,5 +11352,5 @@
 #: build/specialmessages.java:10
 msgid "Audio Device Unavailable"
-msgstr ""
+msgstr "Ingen lydenhet tilgjengelig"
 
 #. Java message loading audio data
@@ -11156,5 +11372,4 @@
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
-"Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
 
 #. Plugin colorscheme
@@ -11175,5 +11390,5 @@
 #: build/trans_plugins.java:9
 msgid "Create a grid of ways."
-msgstr "Lag ett rutenett med linjer."
+msgstr "Lag et rutenett med linjer."
 
 #. Plugin czechaddress
@@ -11186,5 +11401,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Lar deg importere forskjellige dataformater direkte i JOSM."
 
 #. Plugin DirectUpload
@@ -11208,4 +11423,5 @@
 "very fast."
 msgstr ""
+"Lar deg anonymisere tidsstempler og raskt slette deler av store GPX-spor."
 
 #. Plugin globalsat
@@ -11239,5 +11455,7 @@
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr "Gir live GPS input (bevegelig merke) gjennom kobling til gpsd server."
+msgstr ""
+"Gir GPS-informasjon i sanntid (bevegelig merke) gjennom tilkobling til gpsd-"
+"tjener."
 
 #. Plugin measurement
@@ -11248,7 +11466,7 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
-"Gir deg måleverktøy for måling av segmentlengde og segmentretning, areal "
-"omgitt av (en enkelt) lukket linje og lage målestier (som også kan "
-"importeres fra GPX lag)."
+"Gir deg måleverktøy for å måle lengde og retning på segmenter og areal "
+"omgitt av en (enkel) lukket linje, og lage målestier (som også kan "
+"importeres fra GPX-lag)."
 
 #. Plugin nearclick
@@ -11261,5 +11479,5 @@
 "Simulerer et klikk når du gjør korte og små musedrag. Dette er beregnet på "
 "tablets og trykkfølsom skjerm hvor det er problemer å klikke med musa "
-"samtidig som du drar (generelt tablet problem i java)."
+"samtidig som du drar (generelt tablet-problem i java)."
 
 #. Plugin openlayers
@@ -11335,29 +11553,24 @@
 "the jar-file as standalone as well."
 msgstr ""
-"Legger inn en tester for Objektmaler i hjelpemenyen til hjelp ved redigering "
-"av Objektmaler  (fohåndsvising av dialog). Java JAR fila kan også kjøres "
+"Legger inn en tester for objektmaler i hjelpemenyen til hjelp ved redigering "
+"av objektmaler (fohåndsvising av dialog). JAR-fila kan også kjøres "
 "selvstendig."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Last inn TCX filer direkte fra JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
 "user, opens browser showing selected author profile page."
 msgstr ""
-"Verktøy for å redigere opphavsmenn/brukere. Velger kartdata fra valgt "
-"bruker, åpner brukerprofil i internett browser."
+"Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt "
+"bruker, åpner brukerprofil i nettleser."
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11368,5 +11581,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11377,14 +11590,13 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr ""
-"Viser koordinatfestet bilde som bakgrunn i JOSM (WMS servere, Yahoo, ...)."
+msgstr "Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
 
 #. <!--
@@ -11473,5 +11685,5 @@
 #: build/trans_presets.java:1526 build/trans_presets.java:2996
 msgid "Reference"
-msgstr "Vei Nr"
+msgstr "Veinummer"
 
 #. item "Streets/Motorway" text "Name"
@@ -11813,5 +12025,5 @@
 #: build/trans_presets.java:67
 msgid "Motorway Link"
-msgstr "Motorvei tilførselveg"
+msgstr "Av-/påkjørsel for motorvei"
 
 #. item
@@ -11820,5 +12032,5 @@
 #: build/trans_presets.java:70
 msgid "Edit Motorway Link"
-msgstr "Rediger Motorvei tilførselveg"
+msgstr "rediger av-/påkjørsel for motorvei"
 
 #. item "Streets/Motorway Link" check "Embankment"
@@ -11826,5 +12038,5 @@
 #: build/trans_presets.java:84
 msgid "Trunk"
-msgstr "Motortrafikkvei"
+msgstr "Stamvei"
 
 #. item
@@ -11833,5 +12045,5 @@
 #: build/trans_presets.java:87
 msgid "Edit Trunk"
-msgstr "Rediger Motortrafikkvei"
+msgstr "Rediger stamvei"
 
 #. item "Streets/Trunk" check "Oneway"
@@ -11848,5 +12060,5 @@
 #: build/trans_presets.java:104
 msgid "Trunk Link"
-msgstr "Motortrafikkvei tilførselvei"
+msgstr "Av-/påkjørsel for stamvei"
 
 #. item
@@ -11855,5 +12067,5 @@
 #: build/trans_presets.java:107
 msgid "Edit Trunk Link"
-msgstr "Rediger Motortrafikkvei tilførselvei"
+msgstr "Rediger av-/påkjørsel for stamvei"
 
 #. item "Streets/Trunk Link" check "Embankment"
@@ -11873,5 +12085,5 @@
 #: build/trans_presets.java:127
 msgid "Edit Primary Road"
-msgstr "Rediger Riksvei"
+msgstr "Rediger riksvei"
 
 #. item "Streets/Primary" check "Embankment"
@@ -11879,10 +12091,10 @@
 #: build/trans_presets.java:144
 msgid "Primary Link"
-msgstr "Tilførselsveg til Riksvei"
+msgstr "Av-/påkjørsel for riksvei"
 
 #. item
 #: build/trans_presets.java:145
 msgid "Edit Primary Link"
-msgstr "Rediger Riksvei"
+msgstr "Rediger av-/påkjørsel for riksvei"
 
 #. item "Streets/Primary Link" check "Embankment"
@@ -11894,5 +12106,5 @@
 #: build/trans_presets.java:160 build/trans_surveyor.java:80
 msgid "Secondary"
-msgstr "Fylkesvei"
+msgstr "Fylkesvei e.l."
 
 #. item
@@ -11902,5 +12114,5 @@
 #: build/trans_presets.java:164
 msgid "Edit Secondary Road"
-msgstr "Rediger Fylkesvei"
+msgstr "Rediger fylkesvei e.l."
 
 #. item "Streets/Secondary" check "Embankment"
@@ -11926,5 +12138,5 @@
 #: build/trans_presets.java:199 build/trans_surveyor.java:84
 msgid "Unclassified"
-msgstr "Småveier"
+msgstr "Småvei"
 
 #. item
@@ -11934,5 +12146,5 @@
 #: build/trans_presets.java:203
 msgid "Edit Unclassified Road"
-msgstr "Rediger småveier"
+msgstr "Rediger småvei"
 
 #. item "Streets/Unclassified" text "Max. speed (km/h)"
@@ -11983,5 +12195,5 @@
 #: build/trans_presets.java:218 build/trans_surveyor.java:88
 msgid "Residential"
-msgstr "Boligvei"
+msgstr "Boligfeltvei"
 
 #. item
@@ -11990,5 +12202,5 @@
 #: build/trans_presets.java:221
 msgid "Edit Residential Street"
-msgstr "Rediger Boligvei"
+msgstr "Rediger boligfeltvei"
 
 #. item "Streets/Residential" combo "Layer"
@@ -12100,5 +12312,5 @@
 #: build/trans_presets.java:261
 msgid "Serviceway type"
-msgstr "Adkomstvei type"
+msgstr "Type adkomstvei"
 
 #. item "Streets/Service" combo "Serviceway type"
@@ -12140,5 +12352,5 @@
 #: build/trans_presets.java:291
 msgid "Edit Road of unknown type"
-msgstr "Rediger Vei av ukjent type"
+msgstr "Rediger vei av ukjent type"
 
 #. item "Streets/Road (Unknown Type)" text "Width (meters)"
@@ -12177,4 +12389,64 @@
 msgid "Access"
 msgstr "Adkomst"
+
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "ja"
 
 #. color permissive
@@ -12199,5 +12471,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "privat"
@@ -12245,5 +12517,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "destinasjon"
@@ -12280,5 +12552,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "permissive"
@@ -12297,4 +12569,28 @@
 msgid "agricultural"
 msgstr "Skog- og Landbruk"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nei"
 
 #: build/trans_presets.java:315
@@ -12418,5 +12714,5 @@
 #: build/trans_presets.java:335
 msgid "Edit Junction"
-msgstr "Rediger Kryss"
+msgstr "Rediger kryss"
 
 #. item "Streets/Roundabout" label "Edit Junction"
@@ -12510,6 +12806,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "motorway"
@@ -12535,6 +12831,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "trunk"
@@ -12560,6 +12856,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "riksvei"
@@ -12585,6 +12881,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "fylkesvei"
@@ -12598,5 +12894,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "kommunevei"
@@ -12614,5 +12910,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "boligvei"
@@ -12630,5 +12926,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "adkomstvei"
@@ -12655,6 +12968,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "veiarbeid"
@@ -12667,10 +12980,10 @@
 #: build/trans_presets.java:356
 msgid "Edit Bridge"
-msgstr "Rediger Bro"
+msgstr "Rediger bro"
 
 #. item
 #: build/trans_presets.java:368
 msgid "Edit Tunnel"
-msgstr "Rediger Tunnel"
+msgstr "Rediger tunnel"
 
 #. item "Streets/Tunnel" text "Width (meters)"
@@ -12683,10 +12996,10 @@
 #: build/trans_presets.java:383
 msgid "Construction"
-msgstr "Veiarbeide"
+msgstr "Veiarbeid"
 
 #. item
 #: build/trans_presets.java:384
 msgid "Edit Highway Under Construction"
-msgstr "Rediger Vei under bygging"
+msgstr "Rediger vei under bygging"
 
 #: build/trans_presets.java:400
@@ -12704,5 +13017,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -12719,5 +13032,5 @@
 #: build/trans_presets.java:408
 msgid "Edit Bridleway"
-msgstr "Rediger Ridevei"
+msgstr "Rediger ridevei"
 
 #. item "Ways/Bridleway" text "Width (meters)"
@@ -12733,5 +13046,5 @@
 #: build/trans_presets.java:428
 msgid "Edit Cycleway"
-msgstr "Rediger Sykkelvei"
+msgstr "Rediger sykkelvei"
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -12746,5 +13059,5 @@
 #: build/trans_presets.java:447
 msgid "Edit Footway"
-msgstr "Rediger Gangvei"
+msgstr "Rediger gangvei"
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -12759,5 +13072,5 @@
 #: build/trans_presets.java:466
 msgid "Edit Pedestrian Street"
-msgstr "Rediger Gågate"
+msgstr "Rediger gågate"
 
 #. item "Ways/Pedestrian" text "Width (meters)"
@@ -12773,5 +13086,5 @@
 #: build/trans_presets.java:485
 msgid "Edit Flight of Steps"
-msgstr "Rediger Trapper"
+msgstr "Rediger trapper"
 
 #. item "Ways/Steps" text "Width (meters)"
@@ -12787,5 +13100,5 @@
 #: build/trans_presets.java:505
 msgid "Edit Track"
-msgstr "Rediger Traktorvei"
+msgstr "Rediger traktorvei"
 
 #: build/trans_presets.java:514 build/trans_presets.java:535
@@ -12828,5 +13141,5 @@
 #: build/trans_presets.java:525
 msgid "Edit Track of grade 1"
-msgstr "Rediger Traktorvei klasse 1"
+msgstr "Rediger traktorvei klasse 1"
 
 #. item "Ways/Track Grade 1" text "Width (meters)"
@@ -12841,5 +13154,5 @@
 #: build/trans_presets.java:546
 msgid "Edit Track of grade 2"
-msgstr "RedigerTraktorvei klasse 2"
+msgstr "Rediger traktorvei klasse 2"
 
 #. item "Ways/Track Grade 2" text "Width (meters)"
@@ -12854,5 +13167,5 @@
 #: build/trans_presets.java:567
 msgid "Edit Track of grade 3"
-msgstr "RedigerTraktorvei klasse 3"
+msgstr "Rediger traktorvei klasse 3"
 
 #. item "Ways/Track Grade 3" text "Width (meters)"
@@ -12867,5 +13180,5 @@
 #: build/trans_presets.java:588
 msgid "Edit Track of grade 4"
-msgstr "RedigerTraktorvei klasse 4"
+msgstr "Rediger traktorvei klasse 4"
 
 #. item "Ways/Track Grade 4" text "Width (meters)"
@@ -12880,5 +13193,5 @@
 #: build/trans_presets.java:609
 msgid "Edit Track of grade 5"
-msgstr "Rediger Traktorvei klasse 5"
+msgstr "Rediger traktorvei klasse 5"
 
 #. item "Ways/Track Grade 5" text "Width (meters)"
@@ -12894,5 +13207,5 @@
 #: build/trans_presets.java:631
 msgid "Edit Path"
-msgstr "Rediger Sti"
+msgstr "Rediger sti"
 
 #: build/trans_presets.java:637
@@ -12916,5 +13229,5 @@
 #: build/trans_presets.java:659
 msgid "Edit Hiking"
-msgstr "Rediger Tursti"
+msgstr "Rediger tursti"
 
 #. item "Ways/Hiking" text "Width (meters)"
@@ -12930,5 +13243,5 @@
 #: build/trans_presets.java:672
 msgid "Edit Mountain Hiking"
-msgstr "Rediger Fjellsti"
+msgstr "Rediger fjellsti"
 
 #. item "Ways/Mountain Hiking" text "Width (meters)"
@@ -12936,5 +13249,5 @@
 #: build/trans_presets.java:681
 msgid "Demanding Mountain Hiking"
-msgstr "Krevende Fjellsti"
+msgstr "Krevende fjellsti"
 
 #. item
@@ -12944,5 +13257,5 @@
 #: build/trans_presets.java:685
 msgid "Edit Demanding Mountain Hiking"
-msgstr "Rediger Krevende Fjellsti"
+msgstr "Rediger krevende fjellsti"
 
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
@@ -12950,5 +13263,5 @@
 #: build/trans_presets.java:694
 msgid "Alpine Hiking"
-msgstr "Alpin Fjellsti"
+msgstr "Alpin fjellsti"
 
 #. item
@@ -12958,5 +13271,5 @@
 #: build/trans_presets.java:698
 msgid "Edit Alpine Hiking"
-msgstr "Rediger Alpin Fjellsti"
+msgstr "Rediger alpin fjellsti"
 
 #. item "Ways/Alpine Hiking" text "Width (meters)"
@@ -12964,5 +13277,5 @@
 #: build/trans_presets.java:707
 msgid "Demanding Alpine Hiking"
-msgstr "Krevende Alpin Fjellsti"
+msgstr "Krevende alpin fjellsti"
 
 #. item
@@ -12972,5 +13285,5 @@
 #: build/trans_presets.java:711
 msgid "Edit Demanding Alpine Hiking"
-msgstr "Rediger Krevende Alpin Fjellsti"
+msgstr "Rediger krevende alpin fjellsti"
 
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
@@ -12978,5 +13291,5 @@
 #: build/trans_presets.java:720
 msgid "Difficult Alpine Hiking"
-msgstr "Vanskelig Alpin Fjellsti"
+msgstr "Vanskelig alpin fjellsti"
 
 #. item
@@ -12986,5 +13299,5 @@
 #: build/trans_presets.java:724
 msgid "Edit Difficult Alpine Hiking"
-msgstr "Rediger Vanskelig Alpin Fjellsti"
+msgstr "Rediger vanskelig alpin fjellsti"
 
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
@@ -12992,10 +13305,10 @@
 #: build/trans_presets.java:734
 msgid "Waypoints"
-msgstr "Waypoint"
+msgstr "Veipunkt"
 
 #. group "Waypoints"
 #: build/trans_presets.java:735
 msgid "Motorway Junction"
-msgstr "Motorvei Kryss"
+msgstr "Motorveikryss"
 
 #. item
@@ -13003,5 +13316,5 @@
 #: build/trans_presets.java:737
 msgid "Edit Motorway Junction"
-msgstr "Rediger Motorvei Kryss"
+msgstr "Rediger motorveikryss"
 
 #. item "Waypoints/Motorway Junction" text "Name"
@@ -13019,5 +13332,5 @@
 #: build/trans_presets.java:745
 msgid "Edit Service Station"
-msgstr "Rediger Service område"
+msgstr "Rediger Serviceområde"
 
 #. item "Waypoints/Services" text "Name"
@@ -13061,5 +13374,5 @@
 #: build/trans_presets.java:3001
 msgid "Operator"
-msgstr "Driver"
+msgstr "Operatør"
 
 #. item "Waypoints/Services" text "Operator"
@@ -13076,5 +13389,5 @@
 #: build/trans_presets.java:758
 msgid "Pedestrian crossing type"
-msgstr "Gangfelt type"
+msgstr "Type gangfelt"
 
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
@@ -13105,5 +13418,5 @@
 #: build/trans_presets.java:1307
 msgid "Cross on horseback"
-msgstr "Kryssende Ridevei"
+msgstr "Kryssende ridevei"
 
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
@@ -13112,5 +13425,5 @@
 #: build/trans_presets.java:1308
 msgid "Cross by bicycle"
-msgstr "Kryssende Sykkelvei"
+msgstr "Kryssende sykkelvei"
 
 #. item "Waypoints/Traffic Signal" check "Cross by bicycle"
@@ -13120,5 +13433,5 @@
 #: build/trans_presets.java:1309
 msgid "Crossing attendant"
-msgstr "Betjent Fotgjengerfelt"
+msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
@@ -13156,5 +13469,5 @@
 #: build/trans_presets.java:765
 msgid "Stop"
-msgstr "Full Stopp"
+msgstr "Full stopp"
 
 #. item
@@ -13178,5 +13491,5 @@
 #: build/trans_presets.java:779
 msgid "Mini-roundabout"
-msgstr "Mini Rundkjøring"
+msgstr "Mini-rundkjøring"
 
 #. item
@@ -13209,10 +13522,10 @@
 #: build/trans_presets.java:792
 msgid "Edit City Limit Sign"
-msgstr "Rediger bygrense skilt"
+msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Name"
 #: build/trans_presets.java:797
 msgid "Second Name"
-msgstr "Annet Navn"
+msgstr "Annet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
@@ -13249,5 +13562,5 @@
 #: build/trans_presets.java:813
 msgid "Edit Ford"
-msgstr "Rediger Vadested"
+msgstr "Rediger vadested"
 
 #. item "Waypoints/Ford" text "Name"
@@ -13261,5 +13574,5 @@
 #: build/trans_presets.java:822
 msgid "Edit Mountain Pass"
-msgstr "Rediger Fjellpass"
+msgstr "Rediger fjellpass"
 
 #. item "Waypoints/Mountain Pass" text "Name"
@@ -13273,5 +13586,5 @@
 #: build/trans_presets.java:2702 build/trans_presets.java:2709
 msgid "Elevation"
-msgstr "H.O.H."
+msgstr "Høyde"
 
 #. item "Waypoints/Mountain Pass" text "Elevation"
@@ -13365,5 +13678,5 @@
 #: build/trans_presets.java:865
 msgid "Bus Trap"
-msgstr "Buss Sluse"
+msgstr "Bussluse"
 
 #. item
@@ -13371,10 +13684,10 @@
 #: build/trans_presets.java:868
 msgid "Spikes"
-msgstr "Pigg hinder"
+msgstr "Pigghinder"
 
 #. item
 #: build/trans_presets.java:869
 msgid "Edit Spikes"
-msgstr "Rediger Pigg Hinder"
+msgstr "Rediger pigghinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
@@ -13398,5 +13711,5 @@
 #: build/trans_presets.java:891
 msgid "Edit Border Control"
-msgstr "Rediger Tollstasjon"
+msgstr "Rediger tollstasjon"
 
 #. item "Barriers/Border Control" check "Motorcar"
@@ -13448,5 +13761,5 @@
 #: build/trans_presets.java:928
 msgid "Edit Entrance"
-msgstr "Rediger Inngang"
+msgstr "Rediger inngang"
 
 #. item "Barriers/Entrance" check "Motorcar"
@@ -13459,5 +13772,5 @@
 #: build/trans_presets.java:941
 msgid "Edit Gate"
-msgstr "Rediger Port"
+msgstr "Rediger port"
 
 #. item "Barriers/Gate" check "Motorcar"
@@ -13469,5 +13782,5 @@
 #: build/trans_presets.java:953
 msgid "Edit Lift Gate"
-msgstr "Rediger Veibom"
+msgstr "Rediger veibom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
@@ -13489,5 +13802,5 @@
 #: build/trans_presets.java:977
 msgid "Edit Bump Gate"
-msgstr "Rediger Støtfangergjerde"
+msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
@@ -13510,15 +13823,15 @@
 #: build/trans_presets.java:999
 msgid "Edit Stile"
-msgstr "Rediger Gjerdetrapp"
+msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Stile" check "Bicycle"
 #: build/trans_presets.java:1007
 msgid "Sally Port"
-msgstr "Sluse Port"
+msgstr "Sortiport"
 
 #. item
 #: build/trans_presets.java:1008
 msgid "Edit Sally Port"
-msgstr "Rediger Sluse Port"
+msgstr "Rediger sortiport"
 
 #. item "Barriers/Sally Port" check "Motorcar"
@@ -13534,5 +13847,5 @@
 #: build/trans_presets.java:1023
 msgid "Spring"
-msgstr "Vann Kilde"
+msgstr "Vannkilde"
 
 #. item
@@ -13540,5 +13853,5 @@
 #: build/trans_presets.java:1025
 msgid "Edit Spring"
-msgstr "Rediger Vannkilde"
+msgstr "Rediger vannkilde"
 
 #. item "Water/Spring" text "Name"
@@ -13552,5 +13865,5 @@
 #: build/trans_presets.java:1032
 msgid "Edit Drain"
-msgstr "Rediger Drenering"
+msgstr "Rediger drenering"
 
 #. item "Water/Drain" combo "Layer"
@@ -13563,5 +13876,5 @@
 #: build/trans_presets.java:1040
 msgid "Edit Stream"
-msgstr "Rediger Bekk"
+msgstr "Rediger bekk"
 
 #. item "Water/Stream" combo "Layer"
@@ -13574,5 +13887,5 @@
 #: build/trans_presets.java:1048
 msgid "Edit Canal"
-msgstr "Rediger Kanal"
+msgstr "Rediger kanal"
 
 #. item "Water/Canal" combo "Layer"
@@ -13587,5 +13900,5 @@
 #: build/trans_presets.java:1058
 msgid "Edit River"
-msgstr "Rediger Elv"
+msgstr "Rediger elv"
 
 #. item
@@ -13593,5 +13906,5 @@
 #: build/trans_presets.java:1067
 msgid "Edit Water"
-msgstr "Rediger Vann"
+msgstr "Rediger vann"
 
 #. item "Water/Water" text "Name"
@@ -13603,5 +13916,5 @@
 #: build/trans_presets.java:1072
 msgid "Edit Land"
-msgstr "Rediger Land"
+msgstr "Rediger land"
 
 #. item "Water/Land" text "Name"
@@ -13614,5 +13927,5 @@
 #: build/trans_presets.java:1078
 msgid "Edit Basin Landuse"
-msgstr "Rediger Basseng"
+msgstr "Rediger basseng"
 
 #. item "Water/Basin" text "Name"
@@ -13625,15 +13938,15 @@
 #: build/trans_presets.java:1085
 msgid "Edit Reservoir Landuse"
-msgstr "Rediger Drikkevannskilde"
+msgstr "Rediger drikkevannskilde"
 
 #. item "Water/Reservoir" text "Name"
 #: build/trans_presets.java:1090
 msgid "Covered Reservoir"
-msgstr "Tildekt Drikkevannskilde"
+msgstr "Tildekt drikkevannskilde"
 
 #. item
 #: build/trans_presets.java:1091
 msgid "Edit Covered Reservoir"
-msgstr "Rediger Tildekt Drikkevannskilde"
+msgstr "Rediger tildekt drikkevannskilde"
 
 #. item "Water/Covered Reservoir" text "Name"
@@ -13662,5 +13975,5 @@
 #: build/trans_presets.java:1108
 msgid "Edit Wetland"
-msgstr "Rediger Våtmarksområde"
+msgstr "Rediger våtmarksområde"
 
 #. item "Water/Wetland" combo "Type"
@@ -13681,5 +13994,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "Myrområde"
@@ -13695,9 +14008,9 @@
 #: build/trans_presets.java:1111
 msgid "tidalflat"
-msgstr "tidevannsflate"
+msgstr "Tidevannsflate"
 
 #: build/trans_presets.java:1111
 msgid "mangrove"
-msgstr "mangrove"
+msgstr "Mangrove"
 
 #: build/trans_presets.java:1113
@@ -13719,5 +14032,5 @@
 #: build/trans_presets.java:1120
 msgid "Edit Beach"
-msgstr "Rediger Strand"
+msgstr "Rediger strand"
 
 #. item "Water/Beach" text "Name"
@@ -13729,5 +14042,5 @@
 #: build/trans_presets.java:1125
 msgid "Edit Bay"
-msgstr "Rediger Havbukt"
+msgstr "Rediger havbukt"
 
 #. item "Water/Bay" text "Name"
@@ -13740,5 +14053,5 @@
 #: build/trans_presets.java:1131
 msgid "Edit Cliff"
-msgstr "Rediger Klippe"
+msgstr "Rediger klippe"
 
 #. item "Water/Cliff" text "Name"
@@ -13751,5 +14064,5 @@
 #: build/trans_presets.java:1137
 msgid "Edit Coastline"
-msgstr "Rediger Kystlinje"
+msgstr "Rediger kystlinje"
 
 #. item "Water/Coastline" text "Name"
@@ -13763,5 +14076,5 @@
 #: build/trans_presets.java:1144
 msgid "Edit Ferry"
-msgstr "Rediger Fergerute"
+msgstr "Rediger fergerute"
 
 #. item "Water/Ferry Route" text "Name"
@@ -13776,5 +14089,5 @@
 #: build/trans_presets.java:1154
 msgid "Edit Boatyard"
-msgstr "Rediger Skipsverft"
+msgstr "Rediger skipsverft"
 
 #. item "Water/Boatyard" text "Name"
@@ -13787,5 +14100,5 @@
 #: build/trans_presets.java:1161
 msgid "Edit Dock"
-msgstr "Rediger Tørrdokk"
+msgstr "Rediger tørrdokk"
 
 #. item "Water/Dock" text "Name"
@@ -13793,5 +14106,5 @@
 #: build/trans_presets.java:1167
 msgid "Dam"
-msgstr "Dam"
+msgstr "Demning"
 
 #. item
@@ -13799,5 +14112,5 @@
 #: build/trans_presets.java:1169
 msgid "Edit Dam"
-msgstr "Rediger Dam"
+msgstr "Rediger demning"
 
 #. item "Water/Dam" text "Name"
@@ -13809,5 +14122,5 @@
 #: build/trans_presets.java:1176
 msgid "Lock Gate"
-msgstr "SlusePort"
+msgstr "Sluseport"
 
 #. item
@@ -13822,5 +14135,5 @@
 #: build/trans_presets.java:1182
 msgid "Edit Weir"
-msgstr "Rediger Terskeldam"
+msgstr "Rediger terskeldam"
 
 #. item "Waterway Point/Weir" text "Name"
@@ -13832,5 +14145,5 @@
 #: build/trans_presets.java:1188
 msgid "Edit Waterfall"
-msgstr "Rediger Foss"
+msgstr "Rediger foss"
 
 #. item "Waterway Point/Waterfall" text "Name"
@@ -13849,5 +14162,5 @@
 #: build/trans_presets.java:1198
 msgid "Edit Marina"
-msgstr "Rediger Marina"
+msgstr "Rediger marina"
 
 #. item "Waterway Point/Marina" text "Name"
@@ -13860,5 +14173,5 @@
 #: build/trans_presets.java:1204
 msgid "Edit Pier"
-msgstr "Rediger Brygge"
+msgstr "Rediger brygge"
 
 #. item "Waterway Point/Pier" text "Name"
@@ -13871,5 +14184,5 @@
 #: build/trans_presets.java:1210
 msgid "Edit Ferry Terminal"
-msgstr "Rediger Fergeleie"
+msgstr "Rediger fergeleie"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
@@ -13884,5 +14197,5 @@
 #: build/trans_presets.java:1218
 msgid "Edit Slipway"
-msgstr "Rediger Båtslipp"
+msgstr "Rediger båtslipp"
 
 #. item "Waterway Point/Slipway" text "Name"
@@ -13901,5 +14214,5 @@
 #: build/trans_presets.java:1227
 msgid "Edit Rail"
-msgstr "Rediger Jernbane"
+msgstr "Rediger jernbane"
 
 #. item "Railway/Rail" label "Edit Rail"
@@ -13932,5 +14245,5 @@
 #: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "Optional Types"
-msgstr "Alternative Typer"
+msgstr "Alternative typer"
 
 #. item "Railway/Rail" combo "Optional Types"
@@ -13961,14 +14274,14 @@
 #: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "spur"
-msgstr "Privat Sidespor"
+msgstr "Privat sidespor"
 
 #: build/trans_presets.java:1232
 msgid "Narrow Gauge Rail"
-msgstr "Smalspor Jernbane"
+msgstr "Smal jernbane"
 
 #. item
 #: build/trans_presets.java:1233
 msgid "Edit Narrow Gauge Rail"
-msgstr "Rediger Smalspor Jernbane"
+msgstr "Rediger smal jernbane"
 
 #: build/trans_presets.java:1238
@@ -13989,14 +14302,14 @@
 #: build/trans_presets.java:1246
 msgid "Edit Preserved Railway"
-msgstr "Rediger Fredet bane"
+msgstr "Rediger fredet bane"
 
 #: build/trans_presets.java:1251
 msgid "Light Rail"
-msgstr "Trikk"
+msgstr "Bybane"
 
 #. item
 #: build/trans_presets.java:1252
 msgid "Edit Light Rail"
-msgstr "Rediger Trikk"
+msgstr "Rediger bybane"
 
 #: build/trans_presets.java:1257
@@ -14011,14 +14324,14 @@
 #: build/trans_presets.java:1263
 msgid "Tram"
-msgstr "Tram"
+msgstr "Trikk"
 
 #. item
 #: build/trans_presets.java:1264
 msgid "Edit Tram"
-msgstr "Edit Tram"
+msgstr "Rediger trikk"
 
 #: build/trans_presets.java:1269
 msgid "Bus Guideway"
-msgstr "Bussholdeplass"
+msgstr "Busspor"
 
 #. item
@@ -14026,5 +14339,5 @@
 #: build/trans_presets.java:1271
 msgid "Edit Bus Guideway"
-msgstr "Rediger Bussholdeplass"
+msgstr "Rediger busspor"
 
 #. item "Railway/Bus Guideway" text "Width (meters)"
@@ -14033,14 +14346,14 @@
 #: build/trans_presets.java:1288
 msgid "Disused Rail"
-msgstr "Nedlagt Jernbane"
+msgstr "Nedlagt jernbane"
 
 #. item
 #: build/trans_presets.java:1289
 msgid "Edit Disused Railway"
-msgstr "Rediger Nedlagt Jernbane"
+msgstr "Rediger nedlagt jernbane"
 
 #: build/trans_presets.java:1294
 msgid "Abandoned Rail"
-msgstr "Revet Jernbane"
+msgstr "Revet jernbane"
 
 #. item
@@ -14064,5 +14377,5 @@
 #: build/trans_presets.java:1306
 msgid "Crossing type"
-msgstr "Fotgjengerfelt type"
+msgstr "Type fotgjengerfelt"
 
 #. item "Railway/Crossing" check "Crossing attendant"
@@ -14088,5 +14401,5 @@
 #: build/trans_presets.java:1320
 msgid "Edit Chair Lift"
-msgstr "Rediger Stolheis"
+msgstr "Rediger stolheis"
 
 #. item "Aerialway/Chair Lift" text "Name"
@@ -14110,5 +14423,5 @@
 #: build/trans_presets.java:1332
 msgid "Edit Cable Car"
-msgstr "Rediger Taubane"
+msgstr "Rediger taubane"
 
 #. item "Aerialway/Cable Car" text "Name"
@@ -14121,5 +14434,5 @@
 #: build/trans_presets.java:1338
 msgid "Edit Gondola"
-msgstr "Rediger Gondolbane"
+msgstr "Rediger gondolbane"
 
 #. item "Aerialway/Gondola" text "Name"
@@ -14136,5 +14449,5 @@
 #: build/trans_presets.java:1344 build/trans_presets.java:1433
 msgid "Edit Station"
-msgstr "Rediger Stasjon"
+msgstr "Rediger stasjon"
 
 #. group "Car"
@@ -14149,5 +14462,5 @@
 #: build/trans_presets.java:1355
 msgid "Edit Fuel"
-msgstr "Rediger Bensinstasjon"
+msgstr "Rediger bensinstasjon"
 
 #. item "Car/Fuel" text "Operator"
@@ -14171,5 +14484,5 @@
 #: build/trans_presets.java:1363
 msgid "Edit Parking"
-msgstr "Rediger Parkering"
+msgstr "Rediger parkering"
 
 #. item "Car/Parking" text "Name"
@@ -14182,5 +14495,5 @@
 #: build/trans_presets.java:1367
 msgid "surface"
-msgstr "overflateparkering"
+msgstr "Overflateparkering"
 
 #: build/trans_presets.java:1367
@@ -14194,9 +14507,9 @@
 #: build/trans_presets.java:1367
 msgid "park_and_ride"
-msgstr "park_and_ride"
+msgstr "Innfartsparkering"
 
 #: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
-msgstr "Handicap Parkering"
+msgstr "Handicap-plasser"
 
 #. item "Amenities/Toilets" text "Reference number"
@@ -14213,5 +14526,5 @@
 #: build/trans_presets.java:1372
 msgid "Edit Car Wash"
-msgstr "Rediger Bilvask"
+msgstr "Rediger bilvask"
 
 #. item "Car/Wash" text "Operator"
@@ -14235,5 +14548,5 @@
 #: build/trans_presets.java:1385
 msgid "Edit Car Repair"
-msgstr "Rediger Verksted"
+msgstr "Rediger verksted"
 
 #. item "Car/Repair" text "Operator"
@@ -14241,5 +14554,5 @@
 #: build/trans_presets.java:1390 build/trans_presets.java:1414
 msgid "Rental"
-msgstr "Bil Utleie"
+msgstr "Bilutleie"
 
 #. item
@@ -14248,5 +14561,5 @@
 #: build/trans_presets.java:1393
 msgid "Edit Car Rental"
-msgstr "Rediger Bil Utleie"
+msgstr "Rediger bilutleie"
 
 #. item "Car/Rental" text "Operator"
@@ -14259,5 +14572,5 @@
 #: build/trans_presets.java:1400
 msgid "Edit Car Sharing"
-msgstr "Rediger Bildeling"
+msgstr "Rediger bildeling"
 
 #. item
@@ -14265,5 +14578,5 @@
 #: build/trans_presets.java:1409
 msgid "Edit Bicycle Parking"
-msgstr "Rediger Sykkelparkering"
+msgstr "Rediger sykkelparkering"
 
 #. item
@@ -14272,5 +14585,5 @@
 #: build/trans_presets.java:1417
 msgid "Edit Bicycle Rental"
-msgstr "Rediger Sykkelutleie"
+msgstr "Rediger sykkelutleie"
 
 #. item
@@ -14279,15 +14592,15 @@
 #: build/trans_presets.java:1424
 msgid "Edit Bicycle Shop"
-msgstr "Rediger Sykkelbutikk"
+msgstr "Rediger sykkelbutikk"
 
 #. item "Bicycle/Shop" text "Name"
 #: build/trans_presets.java:1429
 msgid "Public Transport"
-msgstr "Offentlig Transport"
+msgstr "Offentlig transport"
 
 #. item "Public Transport/Station" text "Name"
 #: build/trans_presets.java:1438
 msgid "UIC-Reference"
-msgstr "Innternasjonal UIC-Jernbane kode"
+msgstr "Internasjonal UIC-jernbanekode"
 
 #. item "Public Transport/Station" text "UIC-Reference"
@@ -14295,5 +14608,5 @@
 #: build/trans_presets.java:1441
 msgid "Railway Halt"
-msgstr "Jernbane Stoppested"
+msgstr "Jernbanestopp"
 
 #. item
@@ -14301,5 +14614,5 @@
 #: build/trans_presets.java:1443
 msgid "Edit Halt"
-msgstr "Rediger Fullstopp"
+msgstr "Rediger jernbanestopp"
 
 #. item "Public Transport/Railway Halt" text "Name"
@@ -14314,5 +14627,5 @@
 #: build/trans_presets.java:1453
 msgid "Edit Tram Stop"
-msgstr "Rediger Trikkestopp"
+msgstr "Rediger trikkestopp"
 
 #. item "Public Transport/Tram Stop" text "Name"
@@ -14320,5 +14633,5 @@
 #: build/trans_presets.java:1460
 msgid "Railway Platform"
-msgstr "Jernbane Plattform"
+msgstr "Jernbaneplattform"
 
 #. item
@@ -14327,5 +14640,5 @@
 #: build/trans_presets.java:1463
 msgid "Edit Railway Platform"
-msgstr "Rediger Jernbane Plattform"
+msgstr "Rediger jernbaneplattform"
 
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
@@ -14337,5 +14650,5 @@
 #: build/trans_presets.java:1466 build/trans_presets.java:1508
 msgid "Reference (track number)"
-msgstr "Ref (spor nr)"
+msgstr "Spornummer"
 
 #. item "Public Transport/Railway Platform" text "Width (meters)"
@@ -14348,5 +14661,5 @@
 #: build/trans_presets.java:1470
 msgid "Subway Entrance"
-msgstr "T-bane Inngang"
+msgstr "T-baneinngang"
 
 #. item
@@ -14355,5 +14668,5 @@
 #: build/trans_presets.java:1473
 msgid "Edit Subway Entrance"
-msgstr "Rediger T-bane Inngang"
+msgstr "Rediger T-baneinngang"
 
 #. item "Public Transport/Subway Entrance" text "Name"
@@ -14367,5 +14680,5 @@
 #: build/trans_presets.java:1483
 msgid "Bus Station"
-msgstr "Buss Stasjon"
+msgstr "Busstasjon"
 
 #. item
@@ -14374,5 +14687,5 @@
 #: build/trans_presets.java:1486
 msgid "Edit Bus Station"
-msgstr "Rediger Buss Stasjon"
+msgstr "Rediger busstasjon"
 
 #. item "Public Transport/Bus Station" text "Name"
@@ -14380,5 +14693,5 @@
 #: build/trans_presets.java:1492
 msgid "Bus Stop"
-msgstr "Buss Holdeplass"
+msgstr "Bussholdeplass"
 
 #. item
@@ -14388,5 +14701,5 @@
 #: build/trans_presets.java:1496
 msgid "Edit Bus Stop"
-msgstr "Rediger Buss Holdeplass"
+msgstr "Rediger bussholdeplass"
 
 #. item "Public Transport/Bus Stop" text "Name"
@@ -14398,5 +14711,5 @@
 #: build/trans_presets.java:2349
 msgid "Shelter"
-msgstr "Ly for Natten"
+msgstr "Ly for natten"
 
 #. item "Public Transport/Bus Stop" check "Shelter"
@@ -14404,10 +14717,10 @@
 #: build/trans_presets.java:1504
 msgid "Bus Platform"
-msgstr "Buss Platform"
+msgstr "Bussplatform"
 
 #. item
 #: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
-msgstr "Rediger Buss Platform"
+msgstr "Rediger bussplattform"
 
 #. item "Public Transport/Bus Platform" check "Area"
@@ -14421,5 +14734,5 @@
 #: build/trans_presets.java:1515
 msgid "Edit Taxi station"
-msgstr "Rediger Taxi stasjon"
+msgstr "Rediger taxi-stasjon"
 
 #. item "Public Transport/Taxi" text "Name"
@@ -14433,5 +14746,5 @@
 #: build/trans_presets.java:1522
 msgid "Edit Airport"
-msgstr "Rediger Flyplass"
+msgstr "Rediger flyplass"
 
 #. item "Public Transport/Airport" text "Reference"
@@ -14467,5 +14780,5 @@
 #: build/trans_presets.java:1537
 msgid "Edit Hotel"
-msgstr "Rediger Hotell"
+msgstr "Rediger hotell"
 
 #. item "Accomodation/Hotel" text "Name"
@@ -14483,5 +14796,5 @@
 #: build/trans_presets.java:1544
 msgid "Edit Motel"
-msgstr "Rediger Motell"
+msgstr "Rediger motell"
 
 #. item "Accomodation/Motel" text "Name"
@@ -14493,5 +14806,5 @@
 #: build/trans_presets.java:1549
 msgid "Edit Guest House"
-msgstr "Rediger Gjestehus"
+msgstr "Rediger gjestehus"
 
 #. item "Accomodation/Guest House" text "Name"
@@ -14504,5 +14817,5 @@
 #: build/trans_presets.java:1555
 msgid "Edit Chalet"
-msgstr "Rediger Feriehytter"
+msgstr "Rediger feriehytter"
 
 #. item "Accomodation/Chalet" text "Name"
@@ -14515,5 +14828,5 @@
 #: build/trans_presets.java:1561
 msgid "Edit Hostel"
-msgstr "Rediger Ungdomsherberge"
+msgstr "Rediger ungdomsherberge"
 
 #. item "Accomodation/Hostel" text "Name"
@@ -14525,15 +14838,15 @@
 #: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
-msgstr "Rediger Fjellstue"
+msgstr "Rediger fjellstue"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
 #: build/trans_presets.java:1571
 msgid "Caravan Site"
-msgstr "Caravan Plass"
+msgstr "Campingvognplass"
 
 #. item
 #: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
-msgstr "Rediger Caravan Plass"
+msgstr "Rediger campingvognplass"
 
 #. item "Accomodation/Caravan Site" text "Name"
@@ -14546,10 +14859,10 @@
 #: build/trans_presets.java:1578
 msgid "Edit Camping Site"
-msgstr "Rediger Campingplass"
+msgstr "Rediger campingplass"
 
 #. item "Accomodation/Camping Site" text "Name"
 #: build/trans_presets.java:1583
 msgid "Food+Drinks"
-msgstr "Mat & Drikke"
+msgstr "Mat og drikke"
 
 #. group "Food+Drinks"
@@ -14566,5 +14879,5 @@
 #: build/trans_presets.java:1586
 msgid "Edit Restaurant"
-msgstr "Rediger Restaurant"
+msgstr "Rediger restaurant"
 
 #. item "Food+Drinks/Restaurant" text "Name"
@@ -14640,9 +14953,9 @@
 #: build/trans_presets.java:1593
 msgid "Edit Fast Food Restaurant"
-msgstr "Rediger Gatekjøkken"
+msgstr "Rediger gatekjøkken"
 
 #: build/trans_presets.java:1598
 msgid "Cafe"
-msgstr "Kafe"
+msgstr "Kafé"
 
 #. item
@@ -14650,5 +14963,5 @@
 #: build/trans_presets.java:1600
 msgid "Edit Cafe"
-msgstr "Rediger Kafe"
+msgstr "Rediger kafé"
 
 #. item "Food+Drinks/Cafe" text "Name"
@@ -14661,5 +14974,5 @@
 #: build/trans_presets.java:1606
 msgid "Edit Pub"
-msgstr "Rediger Pub"
+msgstr "Rediger pub"
 
 #. item "Food+Drinks/Pub" text "Name"
@@ -14682,5 +14995,5 @@
 #: build/trans_presets.java:1617
 msgid "Edit Bar"
-msgstr "Rediger Bar"
+msgstr "Rediger bar"
 
 #. item "Food+Drinks/Bar" text "Name"
@@ -14693,5 +15006,5 @@
 #: build/trans_presets.java:1623
 msgid "Edit Nightclub"
-msgstr "Rediger Nattklubb"
+msgstr "Rediger nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
@@ -14708,5 +15021,5 @@
 #: build/trans_presets.java:1630
 msgid "Edit Attraction"
-msgstr "Rediger Attraksjon"
+msgstr "Rediger attraksjon"
 
 #. item "Tourism/Attraction" text "Name"
@@ -14716,5 +15029,5 @@
 #: build/trans_presets.java:2373
 msgid "Opening Hours"
-msgstr "Åpningstid"
+msgstr "Åpningstider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
@@ -14727,5 +15040,5 @@
 #: build/trans_presets.java:1637
 msgid "Edit Museum"
-msgstr "Rediger  Museum"
+msgstr "Rediger museum"
 
 #. item "Tourism/Museum" text "Name"
@@ -14739,5 +15052,5 @@
 #: build/trans_presets.java:1644
 msgid "Edit Zoo"
-msgstr "Rediger  Zoologisk hage"
+msgstr "Rediger  zoologisk hage"
 
 #. item "Tourism/Zoo" text "Name"
@@ -14750,5 +15063,5 @@
 #: build/trans_presets.java:1650
 msgid "Edit Viewpoint"
-msgstr "Rediger Utsiktspunkt"
+msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
@@ -14765,10 +15078,10 @@
 #: build/trans_presets.java:1656
 msgid "Edit Theme Park"
-msgstr "Rediger Temapark"
+msgstr "Rediger temapark"
 
 #. item "Tourism/Theme Park" text "Name"
 #: build/trans_presets.java:1660
 msgid "Artwork"
-msgstr "Kunstutstilling"
+msgstr "Kunstverk"
 
 #. item
@@ -14776,5 +15089,5 @@
 #: build/trans_presets.java:1662
 msgid "Edit Artwork"
-msgstr "Rediger Kunstutstilling"
+msgstr "Rediger kunstverk"
 
 #. item "Tourism/Artwork" text "Name"
@@ -14782,5 +15095,5 @@
 #: build/trans_presets.java:1667
 msgid "Information Office"
-msgstr "Informasjonskontor"
+msgstr "Turistinformasjon"
 
 #. item
@@ -14788,5 +15101,5 @@
 #: build/trans_presets.java:1669
 msgid "Edit Information Office"
-msgstr "Rediger Turistinformasjon"
+msgstr "Rediger turistinformasjon"
 
 #. item "Tourism/Information Office" text "Opening Hours"
@@ -14831,5 +15144,5 @@
 #: build/trans_presets.java:1686
 msgid "Board Type"
-msgstr "Info Tavle type"
+msgstr "Tavletype"
 
 #. item "Tourism/Information Board" combo "Board Type"
@@ -14858,10 +15171,10 @@
 #: build/trans_presets.java:1696
 msgid "Other Information Points"
-msgstr "Annen Informasjon"
+msgstr "Annen informasjon"
 
 #. item
 #: build/trans_presets.java:1704
 msgid "Edit Shelter"
-msgstr "Rediger Ly for Natten"
+msgstr "Rediger ly for natten"
 
 #. item "Tourism/Shelter" text "Name"
@@ -14874,10 +15187,10 @@
 #: build/trans_presets.java:1709
 msgid "Picnic Site"
-msgstr "Picnic Plass"
+msgstr "Piknik-sted"
 
 #. item
 #: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
-msgstr "Rediger Picnic Plass"
+msgstr "Rediger piknik-sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
@@ -14896,5 +15209,5 @@
 #: build/trans_presets.java:1720
 msgid "Edit Castle"
-msgstr "Rediger Slott"
+msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
@@ -14906,10 +15219,10 @@
 #: build/trans_presets.java:1725
 msgid "Edit Ruins"
-msgstr "Rediger Ruiner"
+msgstr "Rediger ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
 #: build/trans_presets.java:1729
 msgid "Archaeological Site"
-msgstr "Arkeologisk Plass"
+msgstr "Arkeologisk plass"
 
 #. item
@@ -14918,5 +15231,5 @@
 #: build/trans_presets.java:1732
 msgid "Edit Archaeological Site"
-msgstr "Rediger Arkeologisk Plass"
+msgstr "Rediger arkeologisk plass"
 
 #. item "Historic Places/Archaeological Site" text "Name"
@@ -14929,5 +15242,5 @@
 #: build/trans_presets.java:1738
 msgid "Edit Battlefield"
-msgstr "Rediger Slagmark"
+msgstr "Rediger slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
@@ -14940,5 +15253,5 @@
 #: build/trans_presets.java:1744
 msgid "Edit Monument"
-msgstr "Rediger Monument"
+msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
@@ -14951,15 +15264,15 @@
 #: build/trans_presets.java:1750
 msgid "Edit Memorial"
-msgstr "Rediger Minneplatte"
+msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
 #: build/trans_presets.java:1754
 msgid "Wayside Cross"
-msgstr "Kors i Veikant"
+msgstr "Kors i veikant"
 
 #. item
 #: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
-msgstr "Rediger Kors i Veikant"
+msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
@@ -14971,5 +15284,5 @@
 #: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
-msgstr "Rediger Veialter"
+msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
@@ -14981,10 +15294,10 @@
 #: build/trans_presets.java:1766
 msgid "Water Park"
-msgstr "Svømmehall"
+msgstr "Badepark"
 
 #. item
 #: build/trans_presets.java:1767
 msgid "Edit Water Park"
-msgstr "Rediger Svømmehall"
+msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
@@ -14997,5 +15310,5 @@
 #: build/trans_presets.java:1773
 msgid "Edit Playground"
-msgstr "Rediger Lekeplass"
+msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
@@ -15007,5 +15320,5 @@
 #: build/trans_presets.java:1778
 msgid "Edit Fishing"
-msgstr "Rediger Fiskeplass"
+msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
@@ -15023,5 +15336,5 @@
 #: build/trans_presets.java:1786
 msgid "Edit Stadium"
-msgstr "Rediger Stadion"
+msgstr "Rediger stadion"
 
 #. item "Sport Facilities/Stadium" text "Name"
@@ -15410,27 +15723,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -15478,5 +15791,5 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "bowls"
-msgstr "bowling"
+msgstr "bowls"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
@@ -15498,5 +15811,5 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "cricket_nets"
-msgstr "cricket_nets"
+msgstr "cricketnett"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
@@ -15607,10 +15920,10 @@
 #: build/trans_presets.java:1794
 msgid "Sports Centre"
-msgstr "Sport Senter"
+msgstr "Sportssenter"
 
 #. item
 #: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
-msgstr "Rediger Sport Senter"
+msgstr "Rediger sportssenter"
 
 #: build/trans_presets.java:1803
@@ -15621,5 +15934,5 @@
 #: build/trans_presets.java:1804
 msgid "Edit Pitch"
-msgstr "Rediger Bane"
+msgstr "Rediger bane"
 
 #: build/trans_presets.java:1812
@@ -15630,5 +15943,5 @@
 #: build/trans_presets.java:1813
 msgid "Edit Racetrack"
-msgstr "Rediger Racerbane"
+msgstr "Rediger racerbane"
 
 #: build/trans_presets.java:1821
@@ -15639,5 +15952,5 @@
 #: build/trans_presets.java:1822
 msgid "Edit Golf Course"
-msgstr "Rediger Golfbane"
+msgstr "Rediger golfbane"
 
 #. item "Sport Facilities/Golf Course" text "Name"
@@ -15649,5 +15962,5 @@
 #: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
-msgstr "Rediger Minigolf"
+msgstr "Rediger minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
@@ -15664,5 +15977,5 @@
 #: build/trans_presets.java:1834
 msgid "Edit Multi"
-msgstr "Rediger Flerbruk"
+msgstr "Rediger flerbruk"
 
 #. item "Sport/Multi" combo "type"
@@ -15737,5 +16050,5 @@
 #: build/trans_presets.java:2035 build/trans_presets.java:2041
 msgid "sports_centre"
-msgstr "sportsenter"
+msgstr "sportssenter"
 
 #: build/trans_presets.java:1837 build/trans_presets.java:1843
@@ -15775,5 +16088,5 @@
 #: build/trans_presets.java:1846
 msgid "Edit Athletics"
-msgstr "Rediger Turn"
+msgstr "Rediger turn"
 
 #: build/trans_presets.java:1851
@@ -15784,5 +16097,5 @@
 #: build/trans_presets.java:1852
 msgid "Edit Archery"
-msgstr "Rediger Bueskyting"
+msgstr "Rediger bueskyting"
 
 #: build/trans_presets.java:1857
@@ -15793,5 +16106,5 @@
 #: build/trans_presets.java:1858
 msgid "Edit Climbing"
-msgstr "Rediger Klatring"
+msgstr "Rediger klatring"
 
 #: build/trans_presets.java:1863
@@ -15802,5 +16115,5 @@
 #: build/trans_presets.java:1864
 msgid "Edit Canoeing"
-msgstr "Rediger Kano"
+msgstr "Rediger kano"
 
 #: build/trans_presets.java:1869
@@ -15811,5 +16124,5 @@
 #: build/trans_presets.java:1870
 msgid "Edit Cycling"
-msgstr "Rediger Sykling"
+msgstr "Rediger sykling"
 
 #: build/trans_presets.java:1875
@@ -15820,5 +16133,5 @@
 #: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
-msgstr "Rediger Hundeløp"
+msgstr "Rediger hundeløp"
 
 #: build/trans_presets.java:1881
@@ -15829,5 +16142,5 @@
 #: build/trans_presets.java:1882
 msgid "Edit Equestrian"
-msgstr "Rediger Ridning"
+msgstr "Rediger ridning"
 
 #: build/trans_presets.java:1887
@@ -15838,5 +16151,5 @@
 #: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
-msgstr "Rediger Hesteløp"
+msgstr "Rediger hesteløp"
 
 #: build/trans_presets.java:1893
@@ -15847,14 +16160,14 @@
 #: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
-msgstr "Rediger Gymnastikk"
+msgstr "Rediger gymnastikk"
 
 #: build/trans_presets.java:1899
 msgid "Motor Sports"
-msgstr "Motor Sport"
+msgstr "Motorsport"
 
 #. item
 #: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
-msgstr "Rediger Motor Sport"
+msgstr "Rediger motorsport"
 
 #: build/trans_presets.java:1905
@@ -15865,5 +16178,5 @@
 #: build/trans_presets.java:1906
 msgid "Edit Skating"
-msgstr "Rediger Skøyter"
+msgstr "Rediger skøyter"
 
 #: build/trans_presets.java:1911
@@ -15874,5 +16187,5 @@
 #: build/trans_presets.java:1912
 msgid "Edit Skateboard"
-msgstr "Rediger Skateboard"
+msgstr "Rediger skateboard"
 
 #: build/trans_presets.java:1917
@@ -15883,5 +16196,5 @@
 #: build/trans_presets.java:1918
 msgid "Edit Swimming"
-msgstr "Rediger Svømming"
+msgstr "Rediger svømming"
 
 #: build/trans_presets.java:1923
@@ -15893,10 +16206,10 @@
 #: build/trans_presets.java:1925
 msgid "Edit Skiing"
-msgstr "Rediger Ski"
+msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
 #: build/trans_presets.java:1928
 msgid "Piste type"
-msgstr "Løype Type"
+msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
@@ -15911,5 +16224,5 @@
 #: build/trans_presets.java:1928
 msgid "snow_park"
-msgstr "snø_park"
+msgstr "snøpark"
 
 #: build/trans_presets.java:1929
@@ -15950,5 +16263,5 @@
 #: build/trans_presets.java:1934
 msgid "Edit Shooting"
-msgstr "Rediger Skyting"
+msgstr "Rediger skyting"
 
 #: build/trans_presets.java:1940
@@ -15964,23 +16277,23 @@
 #: build/trans_presets.java:1942
 msgid "Edit Soccer"
-msgstr "Rediger Fotball"
+msgstr "Rediger fotball"
 
 #: build/trans_presets.java:1947
 msgid "Football"
-msgstr "Amerikansk Fotball"
+msgstr "Amerikansk fotball"
 
 #. item
 #: build/trans_presets.java:1948
 msgid "Edit Football"
-msgstr "Rediger Amerikansk Fotball"
+msgstr "Rediger amerikansk fotball"
 
 #: build/trans_presets.java:1953
 msgid "Australian Football"
-msgstr "Australsk Fotball"
+msgstr "Australsk fotball"
 
 #. item
 #: build/trans_presets.java:1954
 msgid "Edit Australian Football"
-msgstr "Rediger Australsk Fotball"
+msgstr "Rediger australsk fotball"
 
 #: build/trans_presets.java:1959
@@ -15991,5 +16304,5 @@
 #: build/trans_presets.java:1960
 msgid "Edit Baseball"
-msgstr "Rediger Baseball"
+msgstr "Rediger baseball"
 
 #: build/trans_presets.java:1965
@@ -16000,5 +16313,5 @@
 #: build/trans_presets.java:1966
 msgid "Edit Basketball"
-msgstr "Rediger Basketball"
+msgstr "Rediger basketball"
 
 #: build/trans_presets.java:1971
@@ -16009,5 +16322,5 @@
 #: build/trans_presets.java:1972
 msgid "Edit Golf"
-msgstr "Rediger Golf"
+msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
@@ -16023,14 +16336,14 @@
 #: build/trans_presets.java:1978
 msgid "Edit Boule"
-msgstr "Rediger Boule"
+msgstr "Rediger boule"
 
 #: build/trans_presets.java:1983
 msgid "Bowls"
-msgstr "Bowling"
+msgstr "Bowls"
 
 #. item
 #: build/trans_presets.java:1984
 msgid "Edit Bowls"
-msgstr "Rediger Bowling"
+msgstr "Rediger bowls"
 
 #: build/trans_presets.java:1989
@@ -16041,14 +16354,14 @@
 #: build/trans_presets.java:1990
 msgid "Edit Cricket"
-msgstr "Rediger Cricket"
+msgstr "Rediger cricket"
 
 #: build/trans_presets.java:1995
 msgid "Cricket Nets"
-msgstr "Cricket Nets"
+msgstr "Cricketnett"
 
 #. item
 #: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
-msgstr "Rediger Cricket Nets"
+msgstr "Rediger cricketnett"
 
 #: build/trans_presets.java:2001
@@ -16059,5 +16372,5 @@
 #: build/trans_presets.java:2002
 msgid "Edit Croquet"
-msgstr "Rediger Krocket"
+msgstr "Rediger krocket"
 
 #: build/trans_presets.java:2007
@@ -16068,5 +16381,5 @@
 #: build/trans_presets.java:2008
 msgid "Edit Hockey"
-msgstr "Rediger Ishockey"
+msgstr "Rediger ishockey"
 
 #: build/trans_presets.java:2013
@@ -16077,5 +16390,5 @@
 #: build/trans_presets.java:2014
 msgid "Edit Pelota"
-msgstr "Rediger Pelota"
+msgstr "Rediger pelota"
 
 #: build/trans_presets.java:2019
@@ -16086,5 +16399,5 @@
 #: build/trans_presets.java:2020
 msgid "Edit Racquet"
-msgstr "Rediger Racquet"
+msgstr "Rediger racquet"
 
 #: build/trans_presets.java:2025
@@ -16095,5 +16408,5 @@
 #: build/trans_presets.java:2026
 msgid "Edit Rugby"
-msgstr "Rediger Rugby"
+msgstr "Rediger rugby"
 
 #: build/trans_presets.java:2031
@@ -16104,5 +16417,5 @@
 #: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
-msgstr "Rediger Bordtennis"
+msgstr "Rediger bordtennis"
 
 #: build/trans_presets.java:2037
@@ -16113,5 +16426,5 @@
 #: build/trans_presets.java:2038
 msgid "Edit Tennis"
-msgstr "Rediger Tennis"
+msgstr "Rediger tennis"
 
 #. <separator/>
@@ -16135,5 +16448,5 @@
 #: build/trans_presets.java:2051
 msgid "Edit Public Building"
-msgstr "Rediger Offentlig bygning"
+msgstr "Rediger offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
@@ -16146,10 +16459,10 @@
 #: build/trans_presets.java:2057
 msgid "Edit Town hall"
-msgstr "Rediger Rådhus"
+msgstr "Rediger rådhus"
 
 #. item "Buildings/Town hall" text "Name"
 #: build/trans_presets.java:2061
 msgid "Embassy"
-msgstr "Ambasade"
+msgstr "Ambassade"
 
 #. item
@@ -16157,5 +16470,5 @@
 #: build/trans_presets.java:2063
 msgid "Edit Embassy"
-msgstr "Rediger Ambasade"
+msgstr "Rediger ambassade"
 
 #. item "Buildings/Embassy" text "Name"
@@ -16169,5 +16482,5 @@
 #: build/trans_presets.java:2070
 msgid "Edit Courthouse"
-msgstr "Rediger Domstol"
+msgstr "Rediger domstol"
 
 #. item "Buildings/Courthouse" text "Name"
@@ -16181,5 +16494,5 @@
 #: build/trans_presets.java:2077
 msgid "Edit Prison"
-msgstr "Rediger Fengsel"
+msgstr "Rediger fengsel"
 
 #. item "Buildings/Prison" text "Name"
@@ -16194,5 +16507,5 @@
 #: build/trans_presets.java:2085
 msgid "Edit Police"
-msgstr "Rediger Politi"
+msgstr "Rediger politi"
 
 #. item "Buildings/Police" text "Name"
@@ -16206,5 +16519,5 @@
 #: build/trans_presets.java:2092
 msgid "Edit Fire Station"
-msgstr "Rediger Brannstasjon"
+msgstr "Rediger brannstasjon"
 
 #. item "Buildings/Fire Station" text "Name"
@@ -16217,5 +16530,5 @@
 #: build/trans_presets.java:2098
 msgid "Edit Post Office"
-msgstr "Rediger Postkontor"
+msgstr "Rediger postkontor"
 
 #. item "Buildings/Post Office" text "Name"
@@ -16228,5 +16541,5 @@
 #: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
-msgstr "Rediger Barnehage"
+msgstr "Rediger barnehage"
 
 #. item "Buildings/Kindergarten" text "Name"
@@ -16239,5 +16552,5 @@
 #: build/trans_presets.java:2110
 msgid "Edit School"
-msgstr "Rediger Skole"
+msgstr "Rediger skole"
 
 #. item "Buildings/School" text "Name"
@@ -16250,5 +16563,5 @@
 #: build/trans_presets.java:2116
 msgid "Edit University"
-msgstr "Rediger Universitet"
+msgstr "Rediger universitet"
 
 #. item "Buildings/University" text "Name"
@@ -16261,5 +16574,5 @@
 #: build/trans_presets.java:2122
 msgid "Edit College"
-msgstr "Rediger Høyskole"
+msgstr "Rediger høyskole"
 
 #. item "Buildings/College" text "Name"
@@ -16274,5 +16587,5 @@
 #: build/trans_presets.java:2130
 msgid "Edit Cinema"
-msgstr "Rediger KIno"
+msgstr "Rediger kino"
 
 #. item "Buildings/Cinema" text "Name"
@@ -16286,10 +16599,10 @@
 #: build/trans_presets.java:2137
 msgid "Edit Library"
-msgstr "Rediger Bibliotek"
+msgstr "Rediger bibliotek"
 
 #. item "Buildings/Library" text "Name"
 #: build/trans_presets.java:2141
 msgid "Arts Centre"
-msgstr "Kunstutstilling"
+msgstr "Kunstsenter"
 
 #. item
@@ -16297,5 +16610,5 @@
 #: build/trans_presets.java:2143
 msgid "Edit Arts Centre"
-msgstr "Rediger Kunstutstilling"
+msgstr "Rediger kunstsenter"
 
 #. item "Buildings/Arts Centre" text "Name"
@@ -16309,10 +16622,10 @@
 #: build/trans_presets.java:2150
 msgid "Edit Theatre"
-msgstr "Rediger Teater"
+msgstr "Rediger teater"
 
 #. item "Buildings/Theatre" text "Name"
 #: build/trans_presets.java:2154
 msgid "Place of Worship"
-msgstr "Kirke"
+msgstr "Tilbedelsessted"
 
 #. item
@@ -16322,5 +16635,5 @@
 #: build/trans_presets.java:2158
 msgid "Edit Place of Worship"
-msgstr "Rediger Kirke"
+msgstr "Rediger tilbedelsessted"
 
 #. item "Buildings/Place of Worship" text "Name"
@@ -16343,5 +16656,5 @@
 #: build/trans_presets.java:2891
 msgid "buddhist"
-msgstr "buddist"
+msgstr "buddhist"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
@@ -16426,5 +16739,5 @@
 #: build/trans_presets.java:2892
 msgid "jehovahs_witness"
-msgstr "jehovahs_vitner"
+msgstr "Jehovas vitner"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
@@ -16436,5 +16749,5 @@
 #: build/trans_presets.java:2892
 msgid "methodist"
-msgstr "methodist"
+msgstr "metodist"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
@@ -16446,10 +16759,10 @@
 #: build/trans_presets.java:2892
 msgid "orthodox"
-msgstr "orthodox"
+msgstr "ortodoks"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "pentecostal"
-msgstr "pentecostal"
+msgstr "pinsebevegelsen"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
@@ -16505,15 +16818,15 @@
 #: build/trans_presets.java:2174
 msgid "City name"
-msgstr "By / sted"
+msgstr "By/sted"
 
 #. item "Buildings/Addresses" text "City name"
 #: build/trans_presets.java:2175
 msgid "Post code"
-msgstr "Postnr"
+msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
 #: build/trans_presets.java:2176
 msgid "Country code"
-msgstr "Land kode"
+msgstr "Landskode"
 
 #. item "Buildings/Addresses" text "Country code"
@@ -16521,5 +16834,5 @@
 #: build/trans_presets.java:2179
 msgid "Address Interpolation"
-msgstr "Interpoler Adresser"
+msgstr "Interpoler adresser"
 
 #. item
@@ -16528,5 +16841,5 @@
 #: build/trans_presets.java:2182
 msgid "Edit Address Interpolation"
-msgstr "Rediger Interpolasjon"
+msgstr "Rediger interpolasjon"
 
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
@@ -16565,5 +16878,5 @@
 #: build/trans_presets.java:2189
 msgid "Edit Works"
-msgstr "Rediger Fabrikk"
+msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
@@ -16575,5 +16888,5 @@
 #: build/trans_presets.java:2194
 msgid "Edit Tower"
-msgstr "Rediger Tårn"
+msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
@@ -16585,15 +16898,15 @@
 #: build/trans_presets.java:2199
 msgid "Edit Water Tower"
-msgstr "Rediger Vanntårn"
+msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
 #: build/trans_presets.java:2203
 msgid "Gasometer"
-msgstr "Gasometer"
+msgstr "Gassbeholder"
 
 #. item
 #: build/trans_presets.java:2204
 msgid "Edit Gasometer"
-msgstr "Rediger Gasometer"
+msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
@@ -16606,5 +16919,5 @@
 #: build/trans_presets.java:2210
 msgid "Edit Lighthouse"
-msgstr "Rediger Fyrtårn"
+msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
@@ -16617,5 +16930,5 @@
 #: build/trans_presets.java:2216
 msgid "Edit Windmill"
-msgstr "Rediger Vindmølle"
+msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
@@ -16628,5 +16941,5 @@
 #: build/trans_presets.java:2222
 msgid "Edit Pipeline"
-msgstr "Rediger Rørledning"
+msgstr "Rediger rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
@@ -16641,5 +16954,5 @@
 #: build/trans_presets.java:2230
 msgid "Edit Wastewater Plant"
-msgstr "Rediger Kloakkrenseanlegg"
+msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
@@ -16652,5 +16965,5 @@
 #: build/trans_presets.java:2236
 msgid "Edit Crane"
-msgstr "Rediger Kran"
+msgstr "Rediger kran"
 
 #. item "Man Made/Crane" text "Name"
@@ -16663,10 +16976,10 @@
 #: build/trans_presets.java:2242
 msgid "Edit Beacon"
-msgstr "Rediger Fyrlykt"
+msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
 #: build/trans_presets.java:2246
 msgid "Survey Point"
-msgstr "Trigpunkt"
+msgstr "Trigonometrisk punkt"
 
 #. item
@@ -16674,5 +16987,5 @@
 #: build/trans_presets.java:2248
 msgid "Edit Survey Point"
-msgstr "Rediger Trigpunkt"
+msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
@@ -16685,5 +16998,5 @@
 #: build/trans_presets.java:2254
 msgid "Edit Surveillance Camera"
-msgstr "Rediger Overvåkingskamera"
+msgstr "Rediger overvåkingskamera"
 
 #. item "Man Made/Surveillance" text "Name"
@@ -16699,5 +17012,5 @@
 #: build/trans_presets.java:2263
 msgid "Edit Power Generator"
-msgstr "Rediger Kraftverk"
+msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
@@ -16740,5 +17053,5 @@
 #: build/trans_presets.java:2271
 msgid "Edit Power Station"
-msgstr "Rediger Kraftstasjon"
+msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Operator"
@@ -16752,5 +17065,5 @@
 #: build/trans_presets.java:2278
 msgid "Edit Power Sub Station"
-msgstr "Rediger Transformatorstasjon"
+msgstr "Rediger transformatorstasjon"
 
 #. item "Man Made/Power Sub Station" text "Operator"
@@ -16758,5 +17071,5 @@
 #: build/trans_presets.java:2281 build/trans_presets.java:2297
 msgid "Line reference"
-msgstr "Kraftlinje Nr"
+msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
@@ -16772,5 +17085,5 @@
 #: build/trans_presets.java:2288
 msgid "Edit Power Tower"
-msgstr "Rediger Kraftmast"
+msgstr "Rediger kraftmast"
 
 #. item "Man Made/Power Tower" label "Edit Power Tower"
@@ -16785,5 +17098,5 @@
 #: build/trans_presets.java:2294
 msgid "Edit Power Line"
-msgstr "Rediger Kraftlinje"
+msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" text "Line reference"
@@ -16800,5 +17113,5 @@
 #: build/trans_presets.java:2302
 msgid "Amenities"
-msgstr "Bekvemligheter"
+msgstr "Fasiliteter"
 
 #. group "Amenities"
@@ -16811,5 +17124,5 @@
 #: build/trans_presets.java:2308 build/trans_presets.java:2400
 msgid "Reference number"
-msgstr "Referanse Nr"
+msgstr "Referansenummer"
 
 #. item "Shops/Vending machine" text "Reference number"
@@ -16821,5 +17134,5 @@
 #: build/trans_presets.java:2312
 msgid "Post Box"
-msgstr "Postboks"
+msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
@@ -16833,5 +17146,5 @@
 #: build/trans_presets.java:2320
 msgid "Edit Telephone"
-msgstr "Rediger Telefon"
+msgstr "Rediger telefon"
 
 #. item "Amenities/Telephone" text "Operator"
@@ -16851,5 +17164,5 @@
 #: build/trans_presets.java:2325 build/trans_presets.java:2404
 msgid "Electronic purses and Charge cards"
-msgstr "Elektronisk lommebok eller Kredittkort"
+msgstr "Elektronisk lommebok eller betalingskort"
 
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
@@ -16880,5 +17193,5 @@
 #: build/trans_presets.java:2333
 msgid "Edit Recycling station"
-msgstr "Rediger Returstasjon"
+msgstr "Rediger returstasjon"
 
 #. item "Amenities/Recycling" label "Edit Recycling station"
@@ -16928,5 +17241,5 @@
 #: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
-msgstr "Rediger Jaktpost"
+msgstr "Rediger jaktpost"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
@@ -16968,5 +17281,5 @@
 #: build/trans_presets.java:2357
 msgid "Edit Fountain"
-msgstr "Rediger Fontene"
+msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
@@ -16980,5 +17293,5 @@
 #: build/trans_presets.java:2364
 msgid "Edit Drinking Water"
-msgstr "Rediger Drikkevann"
+msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
@@ -16991,5 +17304,5 @@
 #: build/trans_presets.java:2370
 msgid "Edit Baby Hatch"
-msgstr "Rediger Stellebord"
+msgstr "Rediger stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
@@ -17006,10 +17319,10 @@
 #: build/trans_presets.java:2378
 msgid "Edit Supermarket"
-msgstr "Rediger Supermarked"
+msgstr "Rediger supermarked"
 
 #. item "Shops/Supermarket" text "Name"
 #: build/trans_presets.java:2382
 msgid "Convenience Store"
-msgstr "Mini Marked"
+msgstr "Minimarked"
 
 #. item
@@ -17017,5 +17330,5 @@
 #: build/trans_presets.java:2384
 msgid "Edit Convenience Store"
-msgstr "Rediger Mini Marked"
+msgstr "Rediger Minimarked"
 
 #. item "Shops/Convenience Store" text "Name"
@@ -17028,5 +17341,5 @@
 #: build/trans_presets.java:2390
 msgid "Edit Kiosk"
-msgstr "Rediger Kiosk"
+msgstr "Rediger kiosk"
 
 #. item "Shops/Kiosk" text "Name"
@@ -17039,5 +17352,5 @@
 #: build/trans_presets.java:2396
 msgid "Edit Vending machine"
-msgstr "Rediger Automat"
+msgstr "Rediger automat"
 
 #. item "Shops/Vending machine" label "Edit Vending machine"
@@ -17045,5 +17358,5 @@
 #: build/trans_presets.java:2398
 msgid "Vending products"
-msgstr "Automat produkter"
+msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
@@ -17054,5 +17367,5 @@
 #: build/trans_presets.java:2398
 msgid "public_transport_plans"
-msgstr "buss, trikk og togkart"
+msgstr "buss-, trikk- og togkart"
 
 #: build/trans_presets.java:2398
@@ -17134,5 +17447,5 @@
 #: build/trans_presets.java:2411
 msgid "Edit Butcher"
-msgstr "Rediger Slakter"
+msgstr "Rediger slakter"
 
 #. item "Shops/Butcher" text "Name"
@@ -17145,5 +17458,5 @@
 #: build/trans_presets.java:2417
 msgid "Edit Baker"
-msgstr "Rediger Baker"
+msgstr "Rediger baker"
 
 #. item "Shops/Baker" text "Name"
@@ -17156,20 +17469,20 @@
 #: build/trans_presets.java:2423
 msgid "Edit Florist"
-msgstr "Rediger Blomster"
+msgstr "Rediger blomster"
 
 #. item "Shops/Florist" text "Name"
 #: build/trans_presets.java:2427
 msgid "Organic"
-msgstr "Biologisk"
+msgstr "Økologisk"
 
 #. item
 #: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
-msgstr "Rediger Biologisk"
+msgstr "Rediger økologisk"
 
 #. item "Shops/Organic" text "Name"
 #: build/trans_presets.java:2432
 msgid "Alcohol"
-msgstr "Sprit og Vin"
+msgstr "Sprit og vin"
 
 #. item
@@ -17177,5 +17490,5 @@
 #: build/trans_presets.java:2434
 msgid "Edit Alcohol Shop"
-msgstr "Rediger Sprit og Vin"
+msgstr "Rediger sprit og vin"
 
 #. item "Shops/Alcohol" text "Name"
@@ -17187,25 +17500,25 @@
 #: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
-msgstr "Rediger Drikke"
+msgstr "Rediger drikke"
 
 #. item "Shops/Beverages" text "Name"
 #: build/trans_presets.java:2443
 msgid "Computer"
-msgstr "Kontor og Data"
+msgstr "Dataelektronikk"
 
 #. item
 #: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
-msgstr "Rediger Kontor og Data"
+msgstr "Rediger dataelektronikk"
 
 #. item "Shops/Computer" text "Name"
 #: build/trans_presets.java:2448
 msgid "Electronics"
-msgstr "Elektronisk"
+msgstr "Elektronikk"
 
 #. item
 #: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
-msgstr "Rediger Elektronisk"
+msgstr "Rediger elektronikk"
 
 #. item "Shops/Electronics" text "Name"
@@ -17217,5 +17530,5 @@
 #: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
-msgstr "Rediger Hifi"
+msgstr "Rediger hifi"
 
 #. item "Shops/Hifi" text "Name"
@@ -17227,5 +17540,5 @@
 #: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
-msgstr "Rediger Møbler"
+msgstr "Rediger møbler"
 
 #. item "Shops/Furniture" text "Name"
@@ -17238,5 +17551,5 @@
 #: build/trans_presets.java:2465
 msgid "Edit Garden Centre"
-msgstr "Rediger Hagesenter"
+msgstr "Rediger hagesenter"
 
 #. item "Shops/Garden Centre" text "Name"
@@ -17249,5 +17562,5 @@
 #: build/trans_presets.java:2471
 msgid "Edit Hardware Store"
-msgstr "Rediger Jernvarehandel"
+msgstr "Rediger jernvarehandel"
 
 #. item "Shops/Hardware" text "Name"
@@ -17260,5 +17573,5 @@
 #: build/trans_presets.java:2477
 msgid "Edit Do-it-yourself-store"
-msgstr "Rediger Byggevare"
+msgstr "Rediger byggevare"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
@@ -17270,5 +17583,5 @@
 #: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
-msgstr "Rediger Kontor"
+msgstr "Rediger kontor"
 
 #. item "Shops/Stationery" text "Name"
@@ -17280,5 +17593,5 @@
 #: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
-msgstr "Rediger Frisør"
+msgstr "Rediger frisør"
 
 #. item "Shops/Hairdresser" text "Name"
@@ -17290,5 +17603,5 @@
 #: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
-msgstr "Rediger Sko"
+msgstr "Rediger sko"
 
 #. item "Shops/Shoes" text "Name"
@@ -17300,5 +17613,5 @@
 #: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
-msgstr "Rediger Leker"
+msgstr "Rediger leker"
 
 #. item "Shops/Toys" text "Name"
@@ -17310,5 +17623,5 @@
 #: build/trans_presets.java:2502
 msgid "Edit Video Shop"
-msgstr "Rediger Video"
+msgstr "Rediger video"
 
 #. item "Shops/Video" text "Name"
@@ -17321,5 +17634,5 @@
 #: build/trans_presets.java:2508
 msgid "Edit Dry Cleaning"
-msgstr "Rediger Renseri"
+msgstr "Rediger renseri"
 
 #. item "Shops/Dry Cleaning" text "Name"
@@ -17332,5 +17645,5 @@
 #: build/trans_presets.java:2514
 msgid "Edit Laundry"
-msgstr "Rediger Vaskeri"
+msgstr "Rediger vaskeri"
 
 #. item "Shops/Laundry" text "Name"
@@ -17343,5 +17656,5 @@
 #: build/trans_presets.java:2520
 msgid "Edit Outdoor Shop"
-msgstr "Rediger Friluftsutstyr"
+msgstr "Rediger friluftsutstyr"
 
 #. item "Shops/Outdoor" text "Name"
@@ -17353,5 +17666,5 @@
 #: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
-msgstr "Rediger Sport"
+msgstr "Rediger sport"
 
 #. item "Shops/Sports" text "Name"
@@ -17363,5 +17676,5 @@
 #: build/trans_presets.java:2530
 msgid "Edit Optician"
-msgstr "Rediger Optiker"
+msgstr "Rediger optiker"
 
 #. item "Shops/Optician" text "Name"
@@ -17379,5 +17692,5 @@
 #: build/trans_presets.java:2539
 msgid "Edit Bank"
-msgstr "Rediger Bank"
+msgstr "Rediger bank"
 
 #. item "Cash/Bank" text "Name"
@@ -17390,5 +17703,5 @@
 #: build/trans_presets.java:2544
 msgid "Money Exchange"
-msgstr "Veksle Valuta"
+msgstr "Veksle valuta"
 
 #. item
@@ -17396,5 +17709,5 @@
 #: build/trans_presets.java:2546
 msgid "Edit Money Exchange"
-msgstr "Rediger Veksle Valuta"
+msgstr "Rediger valutaveksling"
 
 #. item
@@ -17402,5 +17715,5 @@
 #: build/trans_presets.java:2552
 msgid "Edit Automated Teller Machine"
-msgstr "Rediger Minibank"
+msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
@@ -17418,5 +17731,5 @@
 #: build/trans_presets.java:2560
 msgid "Edit Doctors"
-msgstr "Rediger Lege"
+msgstr "Rediger lege"
 
 #. item "Health/Doctors" text "Name"
@@ -17428,5 +17741,5 @@
 #: build/trans_presets.java:2565
 msgid "Edit Dentist"
-msgstr "Rediger Tannlege"
+msgstr "Rediger tannlege"
 
 #. item "Health/Dentist" text "Name"
@@ -17439,5 +17752,5 @@
 #: build/trans_presets.java:2571
 msgid "Edit Pharmacy"
-msgstr "Rediger Apotek"
+msgstr "Rediger apotek"
 
 #. item "Health/Pharmacy" label "Edit Pharmacy"
@@ -17456,5 +17769,5 @@
 #: build/trans_presets.java:2578
 msgid "Edit Hospital"
-msgstr "Rediger Sykehus"
+msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
@@ -17468,5 +17781,5 @@
 #: build/trans_presets.java:2585
 msgid "Edit Emergency Access Point"
-msgstr "Rediger Redningsmøtepunkt"
+msgstr "Rediger redningsmøtepunkt"
 
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
@@ -17475,5 +17788,5 @@
 #: build/trans_presets.java:2588
 msgid "Point Number"
-msgstr "Punkt Nr"
+msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
@@ -17490,5 +17803,5 @@
 #: build/trans_presets.java:2592
 msgid "(Use international code, like +12-345-67890)"
-msgstr "(Benytt internasjonat nummer f.eks. +12-345-67890)"
+msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
@@ -17503,5 +17816,5 @@
 #: build/trans_presets.java:2598
 msgid "Edit Veterinary"
-msgstr "Rediger Veterinær"
+msgstr "Rediger veterinær"
 
 #. group "Places"
@@ -17513,5 +17826,5 @@
 #: build/trans_presets.java:2606
 msgid "Edit Continent"
-msgstr "Rediger Kontinent"
+msgstr "Rediger kontinent"
 
 #. item "Places/Continent" text "Name"
@@ -17523,5 +17836,5 @@
 #: build/trans_presets.java:2612
 msgid "Edit Country"
-msgstr "Rediger Land"
+msgstr "Rediger land"
 
 #. item "Places/Country" text "Name"
@@ -17529,10 +17842,10 @@
 #: build/trans_presets.java:2617 build/trans_presets.java:3002
 msgid "State"
-msgstr "Stat"
+msgstr "Delstat/provins"
 
 #. item
 #: build/trans_presets.java:2618
 msgid "Edit State"
-msgstr "Rediger Delstat"
+msgstr "Rediger delstat/provins"
 
 #. item "Places/State" text "Name"
@@ -17544,5 +17857,5 @@
 #: build/trans_presets.java:2624
 msgid "Edit Region"
-msgstr "Rediger Region (Fylke)"
+msgstr "Rediger region (fylke)"
 
 #. item "Places/Region" text "Name"
@@ -17554,5 +17867,5 @@
 #: build/trans_presets.java:2630
 msgid "Edit County"
-msgstr "Rediger Kommune"
+msgstr "Rediger kommune"
 
 #. item "Places/County" text "Name"
@@ -17565,5 +17878,5 @@
 #: build/trans_presets.java:2637
 msgid "Edit City"
-msgstr "Rediger Storby"
+msgstr "Rediger storby"
 
 #. item "Places/City" text "Name"
@@ -17576,10 +17889,10 @@
 #: build/trans_presets.java:2644
 msgid "Edit Town"
-msgstr "Rediger By"
+msgstr "Rediger by"
 
 #. item "Places/Town" text "Name"
 #: build/trans_presets.java:2649
 msgid "Suburb"
-msgstr "Forstad"
+msgstr "Forstad/bydel"
 
 #. item
@@ -17587,5 +17900,5 @@
 #: build/trans_presets.java:2651
 msgid "Edit Suburb"
-msgstr "Rediger Bydel"
+msgstr "Rediger forstad/bydel"
 
 #. item "Places/Suburb" text "Name"
@@ -17597,5 +17910,5 @@
 #: build/trans_presets.java:2657
 msgid "Edit Village"
-msgstr "Rediger Sted"
+msgstr "Rediger landsby"
 
 #. item "Places/Village" text "Name"
@@ -17607,5 +17920,5 @@
 #: build/trans_presets.java:2663
 msgid "Edit Hamlet"
-msgstr "Rediger Lite Tettsted"
+msgstr "Rediger grend"
 
 #. item "Places/Hamlet" text "Name"
@@ -17619,5 +17932,5 @@
 #: build/trans_presets.java:2671
 msgid "Edit Locality"
-msgstr "Rediger Stedsnavn"
+msgstr "Rediger lokalitet"
 
 #. item "Places/Locality" text "Name"
@@ -17630,5 +17943,5 @@
 #: build/trans_presets.java:2678
 msgid "Edit Island"
-msgstr "Rediger Øy"
+msgstr "Rediger øy"
 
 #. item "Places/Island" text "Name"
@@ -17642,5 +17955,5 @@
 #: build/trans_presets.java:2686
 msgid "Edit Cave Entrance"
-msgstr "Rediger Huleinngang"
+msgstr "Rediger huleinngang"
 
 #. item "Places/Cave Entrance" text "Name"
@@ -17653,5 +17966,5 @@
 #: build/trans_presets.java:2692
 msgid "Edit Peak"
-msgstr "Rediger Fjelltopp"
+msgstr "Rediger fjelltopp"
 
 #. item "Places/Peak" text "Elevation"
@@ -17664,5 +17977,5 @@
 #: build/trans_presets.java:2699
 msgid "Edit Glacier"
-msgstr "Rediger Isbre"
+msgstr "Rediger isbre"
 
 #. item "Places/Glacier" text "Elevation"
@@ -17675,5 +17988,5 @@
 #: build/trans_presets.java:2706
 msgid "Edit Volcano"
-msgstr "Rediger Vulkan"
+msgstr "Rediger vulkan"
 
 #. item "Places/Volcano" text "Elevation"
@@ -17690,5 +18003,5 @@
 #: build/trans_presets.java:2714
 msgid "Edit National Boundary"
-msgstr "Rediger Landegrense"
+msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
@@ -17700,5 +18013,5 @@
 #: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
-msgstr "Rediger Fylkesgrense"
+msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
@@ -17710,5 +18023,5 @@
 #: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
-msgstr "Rediger Kommunegrense"
+msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
@@ -17720,5 +18033,5 @@
 #: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
-msgstr "Rediger Politisk Grense"
+msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
@@ -17730,5 +18043,5 @@
 #: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
-msgstr "Rediger Nasjonal Park Grense"
+msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
@@ -17747,10 +18060,10 @@
 #: build/trans_presets.java:2748
 msgid "Edit Tree"
-msgstr "Rediger Tre"
+msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
 #: build/trans_presets.java:2753
 msgid "Botanical Name"
-msgstr "Botanisk Navn"
+msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
@@ -17764,5 +18077,5 @@
 #: build/trans_presets.java:2758
 msgid "Edit Wood"
-msgstr "Rediger Skogsområde"
+msgstr "Rediger skogsområde"
 
 #. item "Land use/Wood" combo "Type"
@@ -17789,14 +18102,14 @@
 #: build/trans_presets.java:2766
 msgid "Edit Forest Landuse"
-msgstr "Rediger Skog"
+msgstr "Rediger skog"
 
 #: build/trans_presets.java:2772
 msgid "Nature Reserve"
-msgstr "Natur reservat"
+msgstr "Naturreservat"
 
 #. item
 #: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
-msgstr "Rediger Naturreservat"
+msgstr "Rediger naturreservat"
 
 #. item "Land use/Nature Reserve" text "Name"
@@ -17809,5 +18122,5 @@
 #: build/trans_presets.java:2779
 msgid "Edit Scree"
-msgstr "Rediger Steinur"
+msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
@@ -17819,5 +18132,5 @@
 #: build/trans_presets.java:2784
 msgid "Edit Scrub"
-msgstr "Rediger Krattskog"
+msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
@@ -17830,5 +18143,5 @@
 #: build/trans_presets.java:2790
 msgid "Edit Fell"
-msgstr "Rediger Fjell"
+msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
@@ -17841,5 +18154,5 @@
 #: build/trans_presets.java:2796
 msgid "Edit Heath"
-msgstr "Rediger Beite"
+msgstr "Rediger beite"
 
 #. item "Land use/Heath" text "Name"
@@ -17854,5 +18167,5 @@
 #: build/trans_presets.java:2804
 msgid "Edit Farmyard Landuse"
-msgstr "Rediger Gårdstun"
+msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
@@ -17864,5 +18177,5 @@
 #: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
-msgstr "Rediger Åkerland"
+msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
@@ -17874,5 +18187,5 @@
 #: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
-msgstr "Rediger Eng"
+msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
@@ -17884,5 +18197,5 @@
 #: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
-msgstr "Rediger Vingård"
+msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
@@ -17894,5 +18207,5 @@
 #: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
-msgstr "Rediger Hageparseller"
+msgstr "Rediger hageparseller"
 
 #. item "Land use/Allotments" text "Name"
@@ -17905,5 +18218,5 @@
 #: build/trans_presets.java:2835
 msgid "Edit Garden"
-msgstr "Rediger Hage"
+msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
@@ -17915,5 +18228,5 @@
 #: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
-msgstr "Rediger Gress"
+msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
@@ -17926,5 +18239,5 @@
 #: build/trans_presets.java:2847
 msgid "Edit Village Green Landuse"
-msgstr "Rediger Friområde"
+msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
@@ -17937,5 +18250,5 @@
 #: build/trans_presets.java:2854
 msgid "Edit Common"
-msgstr "Rediger Offentlig"
+msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
@@ -17947,5 +18260,5 @@
 #: build/trans_presets.java:2859
 msgid "Edit Park"
-msgstr "Rediger Park"
+msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
@@ -17958,5 +18271,5 @@
 #: build/trans_presets.java:2865
 msgid "Edit Recreation Ground Landuse"
-msgstr "Rediger Friluftsområde"
+msgstr "Rediger friluftsområde"
 
 #. item "Land use/Recreation Ground" text "Name"
@@ -17969,5 +18282,5 @@
 #: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
-msgstr "Rediger Boligområde"
+msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
@@ -17980,5 +18293,5 @@
 #: build/trans_presets.java:2879
 msgid "Edit Graveyard"
-msgstr "Rediger Gravlund"
+msgstr "Rediger gravlund"
 
 #: build/trans_presets.java:2885
@@ -17990,5 +18303,5 @@
 #: build/trans_presets.java:2887
 msgid "Edit Cemetery Landuse"
-msgstr "Rediger Kirkegård"
+msgstr "Rediger kirkegård"
 
 #: build/trans_presets.java:2894
@@ -17999,5 +18312,5 @@
 #: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
-msgstr "Rediger Forretninger"
+msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
@@ -18009,5 +18322,5 @@
 #: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
-msgstr "Rediger Næringsområde"
+msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
@@ -18019,5 +18332,5 @@
 #: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
-msgstr "Rediger Industriområde"
+msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
@@ -18030,5 +18343,5 @@
 #: build/trans_presets.java:2914
 msgid "Edit Railway Landuse"
-msgstr "Rediger Jernbanegrunn"
+msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
@@ -18040,5 +18353,5 @@
 #: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
-msgstr "Rediger Millitært"
+msgstr "Rediger millitært"
 
 #. item "Land use/Military" text "Name"
@@ -18051,5 +18364,5 @@
 #: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
-msgstr "Rediger Byggeplass"
+msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
@@ -18061,5 +18374,5 @@
 #: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
-msgstr "Rediger Rivningsområde"
+msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
@@ -18071,5 +18384,5 @@
 #: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
-msgstr "Rediger Byggeområde"
+msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
@@ -18081,5 +18394,5 @@
 #: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
-msgstr "Rediger Avfallsdeponi"
+msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
@@ -18091,5 +18404,5 @@
 #: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
-msgstr "Rediger Steinbrudd"
+msgstr "Rediger steinbrudd"
 
 #. group "Relations"
@@ -18104,5 +18417,5 @@
 #: build/trans_presets.java:2964
 msgid "Edit Multipolygon"
-msgstr "Rediger Multipolygon"
+msgstr "Rediger multipolygon"
 
 #. item "Relations/Multipolygon" text "Name"
@@ -18111,10 +18424,10 @@
 #: build/trans_presets.java:2970
 msgid "outer segment"
-msgstr "ytre linjesegment (outer)"
+msgstr "ytre linjesegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
 #: build/trans_presets.java:2971
 msgid "inner segment"
-msgstr "indre linjesegment (inner)"
+msgstr "indre linjesegment"
 
 #. item "Relations/Multipolygon" role "inner segment"
@@ -18129,5 +18442,5 @@
 #: build/trans_presets.java:2977
 msgid "Edit Turn Restriction"
-msgstr "Rediger Svingeforbud"
+msgstr "Rediger svingeforbud"
 
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
@@ -18140,29 +18453,29 @@
 #: build/trans_presets.java:2979
 msgid "no_left_turn"
-msgstr "venstresving_forbudt"
+msgstr "venstresving forbudt"
 
 #: build/trans_presets.java:2979
 msgid "no_right_turn"
-msgstr "høyresving_forbudt"
+msgstr "høyresving forbudt"
 
 #: build/trans_presets.java:2979
 msgid "no_straight_on"
-msgstr "rett_frem_forbudt"
+msgstr "rett frem forbudt"
 
 #: build/trans_presets.java:2979
 msgid "no_u_turn"
-msgstr "u-sving_forbudt"
+msgstr "u-sving forbudt"
 
 #: build/trans_presets.java:2979
 msgid "only_right_turn"
-msgstr "påbudt_høyre_sving"
+msgstr "påbudt høyresving"
 
 #: build/trans_presets.java:2979
 msgid "only_left_turn"
-msgstr "påbudt_venstre_sving"
+msgstr "påbudt venstresving"
 
 #: build/trans_presets.java:2979
 msgid "only_straight_on"
-msgstr "påbudt_rett_frem"
+msgstr "påbudt rett frem"
 
 #. item "Relations/Turn restriction" text "Name"
@@ -18176,10 +18489,10 @@
 #: build/trans_presets.java:2985
 msgid "via node or way"
-msgstr "via Node eller Linje"
+msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
 #: build/trans_presets.java:2986
 msgid "to way"
-msgstr "til Linje"
+msgstr "til linje"
 
 #. item "Relations/Turn restriction" role "to way"
@@ -18194,5 +18507,5 @@
 #: build/trans_presets.java:2992
 msgid "Edit Route"
-msgstr "Rediger Rute"
+msgstr "Rediger rute"
 
 #. item "Relations/Route" label "Edit Route"
@@ -18200,5 +18513,5 @@
 #: build/trans_presets.java:2994
 msgid "Route type"
-msgstr "Rute type"
+msgstr "Rutetype"
 
 #. item "Relations/Route" combo "Route type"
@@ -18268,8 +18581,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "sykkel"
@@ -18285,5 +18598,5 @@
 #: build/trans_presets.java:2994
 msgid "ferry"
-msgstr "ferrge"
+msgstr "ferge"
 
 #: build/trans_presets.java:2994
@@ -18338,8 +18651,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "fotgjenger"
@@ -18365,5 +18678,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "T-bane"
@@ -18406,5 +18719,5 @@
 #: build/trans_presets.java:3006
 msgid "route segment"
-msgstr "rute segment"
+msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
@@ -18416,5 +18729,5 @@
 #: build/trans_presets.java:3008
 msgid "backward segment"
-msgstr "forrige avsnitt"
+msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
@@ -18493,4 +18806,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18499,4 +18813,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18505,4 +18820,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18511,4 +18827,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18572,7 +18889,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "bro"
@@ -18630,4 +18947,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18753,7 +19071,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18836,15 +19154,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "uønsket"
@@ -18886,5 +19204,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "hest"
@@ -19094,11 +19412,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "hinder"
@@ -19136,6 +19454,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "gate"
@@ -19191,9 +19509,9 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
-msgstr "Riksvei-spor"
+msgstr "ferdselsvei – traktorvei"
 
 #. color foot
@@ -19247,8 +19565,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "jernbane"
@@ -19269,5 +19587,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "service"
@@ -19281,7 +19599,7 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
-msgstr "sperrekjegle"
+msgstr "vadested"
 
 #. color ford
@@ -19300,5 +19618,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "vendesirkel"
@@ -19313,7 +19631,7 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
-msgstr "treffpunkt_for_nødhjelp"
+msgstr "redningsmøtepunkt"
 
 #. color water
@@ -19326,5 +19644,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "elvebredd"
@@ -19338,7 +19656,7 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
-msgstr "elv"
+msgstr "bekk"
 
 #. color water
@@ -19350,5 +19668,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "tørrdokk"
@@ -19376,5 +19694,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "akvadukt"
@@ -19542,13 +19860,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "menneskeskapt"
@@ -19610,7 +19928,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "jernbanepunkt"
@@ -19633,10 +19951,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
-msgstr "annen_bane"
+msgstr "annen bane"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "jernbanebro"
@@ -19656,7 +19974,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19664,10 +19985,14 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
-msgstr "nedlagt_bane"
+msgstr "nedlagt bane"
 
 #. color rail
@@ -19710,6 +20035,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "aeroway"
@@ -19723,5 +20048,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "stasjon"
@@ -19743,5 +20068,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -19755,5 +20080,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -19801,7 +20126,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "aerialway"
@@ -19818,7 +20143,7 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
-msgstr "nedfart_enkel"
+msgstr "nedfart enkel"
 
 #. color piste_easy
@@ -19831,7 +20156,7 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
-msgstr "nedfart_middels"
+msgstr "nedfart middels"
 
 #. color piste_intermediate
@@ -19844,7 +20169,7 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
-msgstr "nedfart_avansert"
+msgstr "nedfart avansert"
 
 #. color piste_advanced
@@ -19857,7 +20182,7 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
-msgstr "nedfart_ekspert"
+msgstr "nedfart ekspert"
 
 #. color piste_expert
@@ -19870,7 +20195,7 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
-msgstr "nedfart_friløp"
+msgstr "nedfart friløp"
 
 #. color piste_freeride
@@ -19883,7 +20208,7 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
-msgstr "nedfart_nybegynner"
+msgstr "nedfart nybegynner"
 
 #. color piste_novice
@@ -19986,10 +20311,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "kraft"
@@ -20003,5 +20328,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "brygge"
@@ -20015,5 +20340,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "rørgate"
@@ -20141,12 +20466,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "fritid"
@@ -20160,5 +20485,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "marina"
@@ -20230,10 +20555,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
-msgstr "bekvemlighet"
+msgstr "fasilitet"
 
 #. color amenity
@@ -20333,12 +20658,12 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
-msgstr "vei_bekvemligheter"
+msgstr "fasilitet – trafikk"
 
 #. color amenity_traffic
@@ -20722,24 +21047,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
-msgstr "bekvemlighet_light"
+msgstr "fasilitet – lys"
 
 #. color amenity_light
@@ -20769,6 +21094,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "light_vann"
@@ -20829,8 +21154,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "helse"
@@ -21183,26 +21508,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "butikk"
@@ -21274,8 +21599,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotell"
@@ -21425,9 +21750,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turisme"
@@ -21499,8 +21824,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historisk"
@@ -21571,8 +21896,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "grønn"
@@ -21586,5 +21911,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "steinbrudd"
@@ -21598,5 +21923,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -21618,5 +21943,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "vannmagasin"
@@ -21630,5 +21955,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "skog"
@@ -21642,5 +21967,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "gårdstun"
@@ -21663,5 +21988,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "butikker"
@@ -21675,5 +22000,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "industri"
@@ -21687,5 +22012,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -21699,5 +22024,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "byggeområde"
@@ -21711,5 +22036,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -21766,7 +22091,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "millitært"
@@ -21780,5 +22105,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "gravlund"
@@ -21791,5 +22116,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "fjelltopp"
@@ -21804,5 +22129,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "isbre"
@@ -21816,5 +22141,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "vulkan"
@@ -21869,8 +22194,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "natur"
@@ -21884,5 +22209,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "krattskog"
@@ -21896,5 +22221,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "beiteområde"
@@ -21908,5 +22233,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "skogsområde"
@@ -21920,5 +22245,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "søle"
@@ -21932,5 +22257,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "strand"
@@ -22008,8 +22333,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "rute"
@@ -22057,7 +22382,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "grense"
@@ -22199,10 +22524,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "sted"
@@ -22250,6 +22575,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adresse"
@@ -22262,5 +22587,5 @@
 #: build/trans_surveyor.java:6
 msgid "Tunnel Start"
-msgstr "Tunnel Start"
+msgstr "Tunnelstart"
 
 #. <button label="Bridge" hotkey="B" type="toggle">
@@ -22270,5 +22595,5 @@
 #: build/trans_surveyor.java:16
 msgid "Village/City"
-msgstr "Sted/By"
+msgstr "Sted/by"
 
 #. <button label="Parking" hotkey="P" icon="parking">
@@ -22373,5 +22698,5 @@
 #: build/trans_validator.java:38
 msgid "oneway tag on a node"
-msgstr "enveiskjøring egenskap på Node"
+msgstr "enveiskjøring-egenskap på node"
 
 #. node : W : oneway == *
@@ -22389,5 +22714,5 @@
 #: build/trans_validator.java:44
 msgid "wrong highway tag on a node"
-msgstr "feil kjørevei egenskap på node"
+msgstr "feil ferdselsvei-egenskap på node"
 
 #. node : W : highway == track
@@ -22397,10 +22722,10 @@
 #: build/trans_validator.java:47
 msgid "highway without a reference"
-msgstr "vei uten veinummer"
+msgstr "ferdselsvei uten veinummer"
 
 #. way  : I : highway == motorway && nat_ref != *
 #: build/trans_validator.java:48
 msgid "temporary highway type"
-msgstr "midlertidig veitype"
+msgstr "midlertidig ferselsveitype"
 
 #. *    : W : highway == road
@@ -22417,5 +22742,5 @@
 #: build/trans_validator.java:52
 msgid "footway with tag foot"
-msgstr "gangvei med egenskap foot"
+msgstr "gangvei med egenskapen foot"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -22441,10 +22766,10 @@
 #: build/trans_validator.java:62
 msgid "layer tag with + sign"
-msgstr "navn på lag inneholder + tegn"
+msgstr "navn på lag inneholder +-tegn"
 
 #. *    : W : layer == /\+.*/
 #: build/trans_validator.java:64
 msgid "street name contains ss"
-msgstr "gate navn inneholder ss"
+msgstr "gatenavn inneholder ss"
 
 #. *    : I : name == /.*Strasse.*/i
@@ -22478,81 +22803,164 @@
 #: build/trans_wms.java:5
 msgid "Landsat"
-msgstr "LandSat"
-
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+msgstr "Landsat"
+
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
 msgid "NPE Maps"
-msgstr "NPE kart"
-
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+msgstr "NPE-kart"
+
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
-msgstr "NPE kart (Tim)"
+msgstr "NPE-kart (Tim)"
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "Yahoo (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap-data"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Sykkelvei"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Gater NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
-msgstr ""
-
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+msgstr "Terraserver Topo"
+
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
-msgstr ""
+msgstr "Terraserver Urban"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datalag"
+
+#~ msgid "Change"
+#~ msgstr "Endre"
+
+#~ msgid "Rotate"
+#~ msgstr "Roter"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326 (lengde- og breddegrad)"
 
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
 #~ msgstr ""
-#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har "
-#~ "historikk.."
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
+#~ "Kartprojeksjonen «{0}» er kun laget for\n"
+#~ "nordlige grader mellom 46.1° og 57°.\n"
+#~ "Velg annen kartprojeksjon når du ikke bruker\n"
+#~ "en fransk WMS-tjener.\n"
+#~ "Ikke last opp data etter denne beskjeden."
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Kartprojeksjonen «{0}» er bare beregnet på\n"
+#~ "breddegrader mellom 45.7° og 47.9°\n"
+#~ "og lengdegrader mellom 5.7° og 10.6°.\n"
+#~ "Benytt en annen kartprojeksjon når du jobber\n"
+#~ "andre steder enn Sveits eller  Lichtenstein.\n"
+#~ "Ikke last opp data etter  denne meldingen."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikter: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Innstilling av Objektmaler"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://"
+#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Legg til ny Objektmal instilling i lista."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Kilder for objektmaler"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importer TCX-fil …"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importer TCX fil som GPS spor"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Overlapp kartbilder"
+
+#~ msgid "% of lat:"
+#~ msgstr "% av bredden:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% av lengden:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Last inn TCX filer direkte fra JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "Yahoo (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "Yahoo (GNOME-fiks)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "Yahoo (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "Yahoo (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Laster opp data"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Ikke implementert enda."
+
 #~ msgid "Email"
 #~ msgstr "E-post"
@@ -22560,4 +22968,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Løs Konflikter"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
 
 #~ msgid "{0} object has conflicts:"
@@ -22598,4 +23009,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{0} konflikter må løses i {1} objecter"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Oppfrisk liste - Klikk Reload"
+
+#~ msgid "Revert"
+#~ msgstr "Tilbakestill"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i "
+#~ "historikk."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22742,4 +23169,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har "
+#~ "historikk.."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -22780,2 +23214,5 @@
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Opplasting av data feilet av ukjent grunn"
+
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."