Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 21560)
+++ applications/editors/josm/i18n/po/nb.po	(revision 21603)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-06-01 18:59+0000\n"
 "Last-Translator: Smart Viking <smart_viking@live.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -235,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -258,6 +258,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -312,6 +312,6 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
-"</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
+"to.</html>"
 msgstr ""
 
@@ -335,9 +335,9 @@
 #. Add extra shortcut C-S-a
 #. Add extra shortcut ESCAPE
-#.
+#. 
 #. * FIXME: this isn't optimal. In a better world the mapmode actions
 #. * would be able to capture keyboard events and react accordingly. But
 #. * for now this is a reasonable approximation.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -428,6 +428,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -641,12 +641,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1433,5 +1433,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1452,5 +1453,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1601,5 +1602,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr "Vis statusrapport med informasjon for feilsøking"
 
@@ -1621,5 +1623,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1821,5 +1823,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+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"
 
@@ -1889,9 +1892,9 @@
 
 #. Add extra shortcut ESCAPE
-#.
+#. 
 #. * FIXME: this isn't optimal. In a better world the mapmode actions
 #. * would be able to capture keyboard events and react accordingly. But
 #. * for now this is a reasonable approximation.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
@@ -1908,5 +1911,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2196,7 +2199,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Feil under nedlasting"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2230,6 +2233,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr ""
 
@@ -2362,9 +2365,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
-msgstr ""
-"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift"
-"+slipp synkroniserer audio i dette punktet."
+"Drag play head and release near track to play audio from there; "
+"SHIFT+release to synchronize audio at that point."
+msgstr ""
+"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:110
@@ -2491,68 +2494,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Søk …"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Søk etter objekt."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Skriv inn søketekst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "erstatt utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "legg til i utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "fjern fra utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "skill mellom store/små bokstaver"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regulært uttrykk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Nansens gate</b> – «Nansens» og «gate» i nøkkel eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Nansens gate\"</b> – «Nansens gate» i nøkkel eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Nan</b> – «Nan» finnes innen navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> – nøkkel «type» med eksakt verdi «route»."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2562,38 +2565,39 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Nan</b> – «Nan» finnes ikke innen navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> – nøkkel «foot» med hvilken som helst verdi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Spesialsøk:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 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>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+msgstr ""
+"<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>… – alle objekter redigert av angitt bruker"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2601,5 +2605,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2607,11 +2611,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2619,5 +2623,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2625,21 +2633,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> – alle endrede objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> – alle objekter i utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> – alle uferdige objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> – alle objekter uten egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2647,5 +2655,5 @@
 "<b>child <i>uttrykk</i></b> – alle underobjekter av objektene i uttrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2653,13 +2661,13 @@
 "<b>parent <i>uttrykk</i></b> – alle overobjekter av objektene i uttrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 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 <i>eller</i>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2667,11 +2675,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Bruk <b>(</b> og <b>)</b> for å gruppere uttrykk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2679,38 +2687,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Start søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Fant ingen treff for «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2718,5 +2726,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2724,5 +2732,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2730,5 +2738,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2746,51 +2754,54 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 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:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Uventet symbol: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2816,5 +2827,6 @@
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
+msgstr ""
+"{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
@@ -2854,5 +2866,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3062,11 +3074,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you do not see) "
-"might use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have "
+"downloaded.<br>This can cause problems because other objects (that you do "
+"not see) might 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 "
-"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?"
+"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/DeleteCommand.java:459
@@ -3330,6 +3342,6 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
-"<br> and creating a new default preference file.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to "
+"<br>{0}<br> and creating a new default preference file.</html>"
 msgstr ""
 
@@ -3412,5 +3424,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3419,5 +3431,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3426,5 +3438,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3461,5 +3473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3512,5 +3524,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3518,5 +3530,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3524,17 +3536,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "tekst"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3542,5 +3548,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3549,5 +3555,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3555,5 +3561,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3561,5 +3567,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3567,42 +3573,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3611,5 +3617,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3617,5 +3623,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3671,5 +3677,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3679,81 +3686,81 @@
 msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Linje for areal er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Fant mer enn én linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Fant mer enn én linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Fant mer enn én \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukjent rolle «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukjent medlemstype for «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Fant ingen linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Fant ingen linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Fant ingen node eller linje med «via»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not 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/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not 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/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Fant ikke stil for restriksjon {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil for indre linje «{0}» er samme som multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil for ytre linje «{0}» passer ikke."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Feil: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3927,5 +3934,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3996,5 +4004,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4004,5 +4012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4011,5 +4019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4018,5 +4026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4025,5 +4033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4032,5 +4040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4039,9 +4047,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4184,5 +4192,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
+msgstr ""
+"Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -4222,5 +4231,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
-msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
+msgstr ""
+"Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
@@ -4358,6 +4368,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4372,4 +4382,5 @@
 msgstr "Endre"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4563,5 +4574,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4600,6 +4611,6 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
-"html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+"too.</html>"
 msgstr ""
 
@@ -4630,5 +4641,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
@@ -4637,5 +4648,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
@@ -4644,5 +4655,5 @@
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
@@ -4872,5 +4883,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+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 "
@@ -4901,6 +4913,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4912,5 +4925,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Ned"
@@ -4955,6 +4968,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
-"html>"
+"<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 "
@@ -4964,6 +4977,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
-"html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
 msgstr ""
 "<html>Trykk <strong>{0}</strong> for å avslutte sammenslåingen av lokal- og "
@@ -5011,14 +5024,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
+msgstr ""
+"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
-msgstr ""
-"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: {0}"
-"</html>"
+"<html>An error occurred while communicating with the server<br>Details: "
+"{0}</html>"
+msgstr ""
+"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: "
+"{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5208,5 +5222,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
+msgstr ""
+"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
@@ -5238,6 +5253,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5250,6 +5265,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5547,7 +5562,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
 msgid ""
-"<html>Select to show changesets for the currently selected objects only."
-"<br>Unselect to show all changesets for objects in the current data layer.</"
-"html>"
+"<html>Select to show changesets for the currently selected objects "
+"only.<br>Unselect to show all changesets for objects in the current data "
+"layer.</html>"
 msgstr ""
 
@@ -5572,5 +5587,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5588,6 +5604,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5611,5 +5626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5617,5 +5632,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5688,9 +5703,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5708,13 +5724,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5723,45 +5739,41 @@
 msgstr "Legg til"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5988,10 +6000,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6332,4 +6344,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7443,6 +7456,6 @@
 #, java-format
 msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: {0}"
-"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
 
@@ -7466,8 +7479,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126
 msgid ""
-"<html>Please select one the following <strong>standard queries</strong>."
-"Select <strong>Download my changesets only</strong> if you only want to "
-"download changesets created by yourself.<br>Note that JOSM will download "
-"max. 100 changesets.</html>"
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
 msgstr ""
 
@@ -7587,5 +7600,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7594,23 +7607,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Endre verdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7619,5 +7632,5 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7626,77 +7639,81 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Velg en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Velg de objekter, du vil rette egenskaper for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Egenskaper/medlemsskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Egenskaper for valgte objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7811,6 +7828,6 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is discouraged."
-"<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is "
+"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 
@@ -7828,6 +7845,6 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
-"html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation "
+"member?</html>"
 msgstr ""
 
@@ -7982,6 +7999,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8316,6 +8334,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8375,4 +8394,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8455,6 +8475,6 @@
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information. You can both edit the <a href=\"{2}\">help topic in "
-"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
-"a>.</p></html>"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
+"english</a>.</p></html>"
 msgstr ""
 
@@ -8464,6 +8484,6 @@
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
 "class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
-"p></html>"
+"could not be loaded. The error message is "
+"(untranslated):<br><tt>{1}</tt></p></html>"
 msgstr ""
 
@@ -8562,5 +8582,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
+msgstr ""
+"Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8581,5 +8602,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
 msgid "History not initialized yet. Failed to set current primitive."
-msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
+msgstr ""
+"Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
@@ -8741,8 +8763,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Upplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
@@ -8751,6 +8774,6 @@
 "{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>"
+"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/gui/io/AbstractUploadTask.java:132
@@ -8764,12 +8787,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Opplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
 "av en node, linje ellerrelasjon.<br><br>Trykk <strong>{0}</strong> for å "
-"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{1}</"
-"strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
+"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/gui/io/AbstractUploadTask.java:194
@@ -9004,5 +9029,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9019,5 +9044,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9102,6 +9128,6 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a file:</"
-"html>"
+"file for each of them or discard the changes.<br>Layers without a "
+"file:</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -9115,6 +9141,6 @@
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
-"written.<br>Either select another file for this layer or discard the changes."
-"<br>Layer with a non-writable file:</html>"
+"written.<br>Either select another file for this layer or discard the "
+"changes.<br>Layer with a non-writable file:</html>"
 msgid_plural ""
 "<html>{0} layers need saving but have associated files<br>which cannot be "
@@ -9340,5 +9366,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9364,5 +9390,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9417,6 +9444,6 @@
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
-"strong> using <strong>{1} requests</strong>"
+"Uploading <strong>{0} objects</strong> to <strong>multiple "
+"changesets</strong> using <strong>{1} requests</strong>"
 msgstr ""
 
@@ -9470,7 +9497,7 @@
 msgid ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
-"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
-"editing.<br>"
+"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
+"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
+"map editing.<br>"
 msgstr ""
 
@@ -9480,5 +9507,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9503,5 +9530,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9719,7 +9747,7 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points do not include a timestamp we cannot "
+"correlate them with audio data.</html>"
 msgstr ""
 
@@ -9745,7 +9773,7 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points do not include a timestamp we cannot "
+"correlate them with images.</html>"
 msgstr ""
 
@@ -9809,6 +9837,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<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 "
@@ -9824,5 +9852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9992,6 +10020,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:</html>"
 msgstr ""
 
@@ -10051,10 +10079,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the time."
-"<br>Display that photo here.<br>And then, simply capture the time you read "
-"on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Ta et bilde av din GPS mottaker når den viser tid.<br>Vis bildet her."
-"<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the "
+"time.<br>Display that photo here.<br>And then, simply capture the time you "
+"read on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Ta et bilde av din GPS mottaker når den viser tid.<br>Vis bildet "
+"her.<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10120,64 +10148,68 @@
 msgstr "Automatisk forslag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Tidssone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Forskyvning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Jevnfør bilder med GPX spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Jevnfør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Ugyldig tidssone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Ugyldig forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10187,20 +10219,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidssone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10209,5 +10241,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10217,21 +10249,21 @@
 "synkronisere bildene manuelt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Valgte foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10239,17 +10271,17 @@
 msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX sporet har ikke tidskoder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Du bør velge et GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Intgen GPX-spor er valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10260,5 +10292,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10311,14 +10343,14 @@
 msgstr "Feil ved lesing av fil i mappa {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10327,5 +10359,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10334,10 +10366,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10346,5 +10378,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10636,6 +10668,6 @@
 "<html>Run a fully automatic procedure to get an access token from the OSM "
 "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-"fully<br>automatically authorizes the user and retrieves an Access Token.</"
-"html>"
+"fully<br>automatically authorizes the user and retrieves an Access "
+"Token.</html>"
 msgstr ""
 
@@ -10657,8 +10689,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
 msgid ""
-"Please enter your OSM user name and password. The password will <strong>not</"
-"strong> be saved in clear text in the JOSM preferences and it will be "
-"submitted to the OSM server <strong>only once</strong>. Subsequent data "
-"upload requests don't use your password any more."
+"Please enter your OSM user name and password. The password will "
+"<strong>not</strong> be saved in clear text in the JOSM preferences and it "
+"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
+"data upload requests don't use your password any more."
 msgstr ""
 
@@ -10778,6 +10810,6 @@
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
-"<br><br>Please check username and password and try again.</html>"
+"OSM server failed. JOSM failed to log into {0}<br>for user "
+"{1}.<br><br>Please check username and password and try again.</html>"
 msgstr ""
 
@@ -10887,5 +10919,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11019,8 +11052,8 @@
 "authorization page in an external browser. Please login with your OSM "
 "username and password and follow the instructions to authorize the Request "
-"Token. Then switch back to this dialog and click on <strong>{0}</"
-"strong><br><br>If launching the external browser fails you can copy the "
-"following authorize URL and paste it into the address field of your browser."
-"</html>"
+"Token. Then switch back to this dialog and click on "
+"<strong>{0}</strong><br><br>If launching the external browser fails you can "
+"copy the following authorize URL and paste it into the address field of your "
+"browser.</html>"
 msgstr ""
 
@@ -11103,8 +11136,8 @@
 msgid ""
 "<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
-"test to retrieve the user details for this token failed, though."
-"<br>Depending on what rights are granted to this token you may nevertheless "
-"use it<br>to upload data, upload GPS traces, and/or access other protected "
-"resources.</html>"
+"test to retrieve the user details for this token failed, "
+"though.<br>Depending on what rights are granted to this token you may "
+"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
+"other protected resources.</html>"
 msgstr ""
 
@@ -11131,7 +11164,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
 msgid ""
-"<html>The test failed because the server responded with an internal error."
-"<br>JOSM could not decide whether the token is valid. Please try again later."
-"</html>"
+"<html>The test failed because the server responded with an internal "
+"error.<br>JOSM could not decide whether the token is valid. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -11204,26 +11237,22 @@
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Separate waypoints med gyldig tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Trackpoints med navn."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
@@ -11231,9 +11260,9 @@
 "tilgjengelig)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11243,5 +11272,5 @@
 "innspilt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11250,21 +11279,15 @@
 "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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11274,5 +11297,5 @@
 "navn eller beskrivelse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11282,5 +11305,5 @@
 "importert  WAV fil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11289,17 +11312,17 @@
 "Antall sekunder for forover eller bakover hopp ved trykk på aktuell knapp"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Forover/bakover tid (sekunder)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Rask avspilling multiplikator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11309,13 +11332,13 @@
 "posisjon for lydsporet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Tid på innledning (sekunder)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Stemme  recorder kalibrering"
@@ -11355,5 +11378,5 @@
 msgstr "Farger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11364,34 +11387,34 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 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:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../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:47
+#: ../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:48
+#: ../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)"
@@ -11399,5 +11422,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11419,5 +11442,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11459,5 +11482,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11471,50 +11494,60 @@
 msgstr "Til fots"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspiler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig opptegning (ser uryddig ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 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:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Bare ved enden af linjen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../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:57
+#: ../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:58
+#: ../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:59
+#: ../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:60
+#: ../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:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+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/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11524,9 +11557,9 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11535,10 +11568,10 @@
 "alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11546,30 +11579,32 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 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:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Tegn retningspiler ved hjelp av tabellopslag i stedet for kompleks matematik."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
 "one."
-msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+msgstr ""
+"Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 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:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11579,9 +11614,9 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 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:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11589,46 +11624,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 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:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningspiler på linjestykker."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+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:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 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:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -11700,5 +11736,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11747,6 +11784,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11823,6 +11860,6 @@
 "a menu entry of a button for the first time. So some of your changes may "
 "become active even without restart --- but also without collision handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes here."
-"</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes "
+"here.</p>"
 msgstr ""
 
@@ -11835,9 +11872,9 @@
 "keyboard do not have them, Sun keyboards do), then do not use it. Also there "
 "are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. "
-"'':''/Colon). Please do not use them either, use the base key ('';''/"
-"Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. "
-"Not doing so may result in conflicts, as there is no way for JOSM to know "
-"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard.</"
-"p>"
+"'':''/Colon). Please do not use them either, use the base key "
+"('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) "
+"instead. Not doing so may result in conflicts, as there is no way for JOSM "
+"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
+"keyboard.</p>"
 msgstr ""
 
@@ -12136,6 +12173,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources from<br>''{0}''."
-"<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources "
+"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 
@@ -12257,6 +12294,6 @@
 #, java-format
 msgid ""
-"<html>Failed to build URL ''{0}'' for validating the OSM API server."
-"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"<html>Failed to build URL ''{0}'' for validating the OSM API "
+"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12278,6 +12315,6 @@
 msgid ""
 "<html>Failed to retrieve a list of changesets from the OSM API server "
-"at<br>''{1}''. The server responded with the return code {0} instead of 200."
-"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"at<br>''{1}''. The server responded with the return code {0} instead of "
+"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12355,5 +12392,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12369,5 +12407,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12461,6 +12500,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
 msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
+"Use standard system settings (disabled. Start JOSM with <tt>-"
+"Djava.net.useSystemProxies=true</tt> to enable)"
 msgstr ""
 
@@ -12756,5 +12795,5 @@
 #. Just log something. The network stack will also throw an exception which will be caught
 #. somewhere else
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
@@ -12939,5 +12978,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13219,5 +13259,6 @@
 "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste «{1}»"
+"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste "
+"«{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150
@@ -13330,6 +13371,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
+"<html>An error occurred while restoring backup file.<br>Error "
+"is:<br>{0}</html>"
 msgstr ""
 
@@ -13357,6 +13398,6 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Missing manadatory attributes on element ''bounds''. Got "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
@@ -13398,5 +13439,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13827,14 +13869,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13843,23 +13890,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13867,5 +13909,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13873,17 +13915,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13891,5 +13933,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13901,42 +13943,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Fjern programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Behold programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13945,5 +13987,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13952,21 +13994,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, 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:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -13974,9 +14017,9 @@
 "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Skal programtillegget fjernes?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13986,14 +14029,14 @@
 "lese programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "ingen beskrivelse tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14034,5 +14077,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14094,5 +14138,5 @@
 
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
 msgid "Do nothing"
@@ -14175,6 +14219,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
+"current<br>dataset violates a precondition.<br>The error message "
+"is:<br>{0}</html>"
 msgstr ""
 "<html>Opplasting til tjeneren <strong>feilet</strong> fordi nåværende "
@@ -14184,7 +14228,7 @@
 #, java-format
 msgid ""
-"<html>Authentication at the OSM server with the username ''{0}'' failed."
-"<br>Please check the username and the password in the JOSM preferences.</"
-"html>"
+"<html>Authentication at the OSM server with the username ''{0}'' "
+"failed.<br>Please check the username and the password in the JOSM "
+"preferences.</html>"
 msgstr ""
 
@@ -14192,7 +14236,7 @@
 #, java-format
 msgid ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
-"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
-"html>"
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
+"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
+"token.</html>"
 msgstr ""
 
@@ -14200,8 +14244,8 @@
 #, java-format
 msgid ""
-"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorised to access the protected resource<br>''{1}''."
-"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
-"html>"
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
+"failed.<br>The token is not authorised to access the protected "
+"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
+"another OAuth token.</html>"
 msgstr ""
 
@@ -14221,7 +14265,7 @@
 msgid ""
 "<html>Communication with the OSM server ''{0}''failed. The server "
-"replied<br>the following error code and the following error message:"
-"<br><strong>Error code:<strong> {1}<br><strong>Error message (untranslated)</"
-"strong>: {2}</html>"
+"replied<br>the following error code and the following error "
+"message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
+"(untranslated)</strong>: {2}</html>"
 msgstr ""
 
@@ -14290,6 +14334,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14301,7 +14346,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:371
 msgid ""
-"The area you tried to download is too big or your request was too large."
-"<br>Either request a smaller area or use an export file provided by the OSM "
-"community."
+"The area you tried to download is too big or your request was too "
+"large.<br>Either request a smaller area or use an export file provided by "
+"the OSM community."
 msgstr ""
 
@@ -14333,9 +14378,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15004,7 +15049,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15014,5 +15059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15022,5 +15067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15036,5 +15081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15044,5 +15089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15073,5 +15118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15080,5 +15125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15087,5 +15132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15094,5 +15139,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15101,5 +15146,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15108,5 +15153,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15140,14 +15185,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"Et eget programtillegg for fransk Cadastre wms (matrikkel) på www.cadastre."
-"gouv.fr<BR><BR>Du finner betingelser for bruk her (på fransk): <br><a href="
-"\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> "
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
+msgstr ""
+"Et eget programtillegg for fransk Cadastre wms (matrikkel) på "
+"www.cadastre.gouv.fr<BR><BR>Du finner betingelser for bruk her (på fransk): "
+"<br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
 "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
 "<BR>før du laster inn data med dette programtillegget."
@@ -15160,6 +15208,6 @@
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
-"<html>Verdien på \"source\" er aktivisert ved automatisk kildeangivelse</"
-"html>"
+"<html>Verdien på \"source\" er aktivisert ved automatisk "
+"kildeangivelse</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
@@ -15637,34 +15685,35 @@
 msgstr "Feil Lambert sone på mellomlager"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Bruk"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Velg en fargepalett"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Fargepalett"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Velg fargepalett for sletting"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Velg fargepalett i lista"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Lagre de brukte fargene i en ny farge palett."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Fjern valgte palett fra lista."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Farge Palett"
@@ -15737,5 +15786,5 @@
 msgstr "Lag for redigering av GPX-spor"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konverter til GPX lag med anonymisert tid"
@@ -15826,4 +15875,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16036,5 +16086,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16155,5 +16205,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250."
@@ -16176,6 +16227,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Nøyaktighet på Douglas-Peucker linjeforenkling, målt i grader.<br>Lave "
@@ -16465,7 +16517,7 @@
 "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>"
+"<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:109
@@ -16492,5 +16544,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr "Header inneholder flere verdier og kan ikke kobles til enkelt streng"
 
@@ -16604,5 +16657,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16654,5 +16708,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -16944,5 +16999,6 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program"
+msgstr ""
+"Et programtillegg som tillater at JOSM blir styrt av et annet program"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
@@ -17475,4 +17531,12 @@
 msgstr "Terasse"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17917,6 +17981,6 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
 msgid ""
-"Development of the turn restriction plugin was sponsored by <a href=\"http://"
-"www.skobbler.de\">skobbler GmbH</a>."
+"Development of the turn restriction plugin was sponsored by <a "
+"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
 
@@ -18002,8 +18066,8 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
-"a turn restriction, the way with role <tt>from</tt> should be different from "
-"the way with role <tt>to</tt>, though."
+"This turn restriction uses the OSM way <span class=\"object-"
+"name\">{0}</span> with role <tt>from</tt> <strong>and</strong> with role "
+"<tt>to</tt>. In a turn restriction, the way with role <tt>from</tt> should "
+"be different from the way with role <tt>to</tt>, though."
 msgstr ""
 
@@ -18057,8 +18121,8 @@
 "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
 "<strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at "
-"node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">"
-"{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to "
-"set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-"
-"object."
+"node <span class=\"object-name\">{2}</span> but <span class=\"object-"
+"name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It is "
+"recommended to set <span class=\"object-name\">{2}</span> as unique "
+"<strong>via</strong>-object."
 msgstr ""
 
@@ -18170,6 +18234,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM node <span class=\"object-"
+"name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18177,6 +18241,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM relation <span class=\"object-"
+"name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18687,5 +18751,6 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
+msgstr ""
+"Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:157
@@ -18817,9 +18882,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"Kildene (URL eller filnavn) for stavekontroll (se http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) eller \"tag checking data files\"."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
+msgstr ""
+"Kildene (URL eller filnavn) for stavekontroll (se "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) eller \"tag "
+"checking data files\"."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
@@ -18965,5 +19032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19008,5 +19075,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr "Sjekker for noder uten egenskaper 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:60
@@ -19044,5 +19112,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:36
 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:70
@@ -19063,5 +19132,5 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19438,9 +19507,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19451,10 +19517,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Database er tatt ned for vedlikehold"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19464,25 +19530,25 @@
 "mindre område eller bruk planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "kunne ikke hente lyd fra URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Ingen lydenhet tilgjengelig"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "Dine redigeringer må være offentlig frigitt for å laste opp nye data"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19490,17 +19556,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "skog"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19508,7 +19574,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19518,5 +19584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19559,5 +19625,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19567,5 +19633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19575,5 +19641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19583,8 +19649,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19598,5 +19664,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19607,5 +19673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19614,7 +19680,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19624,5 +19690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19632,5 +19698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19640,5 +19706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19648,5 +19714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19656,5 +19722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19664,5 +19730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19672,8 +19738,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 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
@@ -19683,58 +19749,60 @@
 msgstr "rute"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Valgfrie attributter:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "ingen kombinasjon"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Fullt navn"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Gjerdetrapp"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Hjemmeside"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoist"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Forstørr"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Ny rolle"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Lag ny node."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Lagre"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19812,5 +19880,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM"
 
@@ -19996,6 +20065,13 @@
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20004,5 +20080,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20011,10 +20087,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20025,5 +20101,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20033,5 +20109,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20040,15 +20116,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20057,8 +20133,9 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr "Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
+msgstr ""
+"Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
 
 #. <!--
@@ -20945,7 +21022,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21085,8 +21162,8 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--restrictions tags -->
 #. <!--the restrictions rules should be placed before the path rule! -->
-#.
+#. 
 #. <rule>
 #. <condition k="access" b="no"/>
@@ -21296,5 +21373,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21304,5 +21381,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21321,5 +21398,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21329,5 +21406,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21346,5 +21423,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21354,5 +21431,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21371,5 +21448,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21379,5 +21456,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21392,5 +21469,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21408,5 +21485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21424,5 +21501,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21431,5 +21508,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21439,5 +21516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21457,5 +21534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21464,5 +21541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21472,5 +21549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22174,5 +22251,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22223,5 +22300,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22318,5 +22395,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22484,5 +22561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22816,5 +22893,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22824,5 +22901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22832,5 +22909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22840,5 +22917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22848,5 +22925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22856,5 +22933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22864,5 +22941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22873,5 +22950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24291,5 +24368,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24299,5 +24376,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24307,5 +24384,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24315,5 +24392,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24677,7 +24754,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24687,5 +24764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24695,5 +24772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24703,5 +24780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24711,5 +24788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24719,5 +24796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24727,5 +24804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24735,5 +24812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24743,5 +24820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24751,5 +24828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24759,5 +24836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24767,5 +24844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24775,5 +24852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24783,5 +24860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24791,5 +24868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24799,5 +24876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24807,5 +24884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24815,5 +24892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24823,5 +24900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24831,5 +24908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24839,5 +24916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24847,5 +24924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24855,5 +24932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24863,5 +24940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24871,5 +24948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24879,5 +24956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24887,5 +24964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24895,5 +24972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24903,5 +24980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24911,5 +24988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24919,5 +24996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24927,5 +25004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24935,5 +25012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24943,5 +25020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24951,5 +25028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24959,5 +25036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24967,5 +25044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24975,5 +25052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24983,5 +25060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24991,5 +25068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24999,5 +25076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25007,5 +25084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25015,5 +25092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25023,5 +25100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25031,5 +25108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25039,5 +25116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25047,5 +25124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26751,7 +26828,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26761,5 +26838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26769,5 +26846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26777,5 +26854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26785,5 +26862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26793,5 +26870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26801,5 +26878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26809,5 +26886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26817,5 +26894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28238,5 +28315,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28252,5 +28329,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28260,5 +28337,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28269,5 +28346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28280,7 +28357,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28290,5 +28367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28298,5 +28375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28306,5 +28383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28314,5 +28391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28346,5 +28423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28360,5 +28437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28368,5 +28445,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28375,5 +28452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28383,5 +28460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28392,5 +28469,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28415,5 +28492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28528,9 +28605,9 @@
 #. 7. scale_min / scale_max
 #. - zoom scale for display
-#.
+#. 
 #. Using both area and line attributes for the same key/value pair does work. For areas
 #. first the best matching area rule is searched and the best matching line rule is
 #. connected with it. They need not have the same key/value pair.
-#.
+#. 
 #. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
 #. If both are given, the color name is introduced in preferences with that value. If only
@@ -28538,5 +28615,5 @@
 #. modified preferences or previous value is used. The 6 hex digit color code can also
 #. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
+#. 
 #. Linemod's are drawn over or under the line they are associated with and modify the
 #. appearance. There can be multiple linemod's for one way (contrary to line styles,
@@ -28546,8 +28623,8 @@
 #. on the sides of the way or the waystyles itself must use alpha channel (which may
 #. look strange).
-#.
+#. 
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
 #. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
+#. 
 #. For external files the <rules> should have following elements:
 #. - author           the author of the style
@@ -28561,5 +28638,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28567,5 +28644,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28614,6 +28691,6 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
 #. <rule>
@@ -28693,5 +28770,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28701,11 +28778,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28721,5 +28798,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28728,5 +28805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28735,5 +28812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28749,5 +28826,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28761,5 +28838,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28768,5 +28845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28775,5 +28852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28782,5 +28859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28789,5 +28866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28796,5 +28873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28803,5 +28880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28810,5 +28887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28817,5 +28894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28824,5 +28901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28831,5 +28908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28838,5 +28915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28845,5 +28922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28852,5 +28929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28859,5 +28936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29034,7 +29111,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29048,5 +29125,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29056,7 +29133,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29066,5 +29143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29074,5 +29151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29082,5 +29159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29090,5 +29167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29104,5 +29181,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29111,5 +29188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29119,5 +29196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29126,5 +29203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29133,5 +29210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29140,5 +29217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29147,5 +29224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29154,5 +29231,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29161,5 +29238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29168,5 +29245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29175,5 +29252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29182,5 +29259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29194,5 +29271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29206,5 +29283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29213,5 +29290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29225,5 +29302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29238,5 +29315,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29251,5 +29328,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29263,5 +29340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29275,5 +29352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29282,5 +29359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29289,5 +29366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29297,5 +29374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29304,5 +29381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29311,5 +29388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29318,5 +29395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29326,5 +29403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29335,5 +29412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29343,7 +29420,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29353,5 +29430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29361,5 +29438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29369,5 +29446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29378,5 +29455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29385,5 +29462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29393,5 +29470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29401,5 +29478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29409,5 +29486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29417,5 +29494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29425,5 +29502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29433,5 +29510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29441,5 +29518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29449,5 +29526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29457,5 +29534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29478,5 +29555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29491,7 +29568,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29501,5 +29578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29508,5 +29585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29516,5 +29593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29523,5 +29600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29531,5 +29608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29539,5 +29616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29553,5 +29630,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29562,5 +29639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29579,5 +29656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29587,5 +29664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29598,5 +29675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29615,5 +29692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29622,5 +29699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29629,5 +29706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29636,7 +29713,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29647,5 +29724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29660,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29672,5 +29749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29680,5 +29757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29692,5 +29769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29704,5 +29781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29711,5 +29788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29718,7 +29795,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29728,5 +29805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29736,5 +29813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29744,5 +29821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29752,5 +29829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29760,5 +29837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29774,7 +29851,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29789,5 +29866,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29802,5 +29879,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29815,5 +29892,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29828,5 +29905,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29841,5 +29918,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29854,7 +29931,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29864,5 +29941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29871,5 +29948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29879,5 +29956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29887,5 +29964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29895,5 +29972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29903,5 +29980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29911,5 +29988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29919,5 +29996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29927,5 +30004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29935,5 +30012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29943,5 +30020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29951,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29959,5 +30036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29977,5 +30054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29990,5 +30067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30001,7 +30078,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30011,5 +30088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30019,5 +30096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30027,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30035,5 +30112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30043,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30051,5 +30128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30059,5 +30136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30067,5 +30144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30075,5 +30152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30083,5 +30160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30091,5 +30168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30099,5 +30176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30107,5 +30184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30115,5 +30192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30123,5 +30200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30131,5 +30208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30151,5 +30228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30163,7 +30240,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30173,5 +30250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30181,5 +30258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30189,5 +30266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30197,5 +30274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30205,5 +30282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30213,5 +30290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30221,5 +30298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30229,5 +30306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30237,5 +30314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30245,5 +30322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30262,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30270,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30278,5 +30355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30286,5 +30363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30294,5 +30371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30302,5 +30379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30310,5 +30387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30318,5 +30395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30326,5 +30403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30334,5 +30411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30342,5 +30419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30350,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30367,5 +30444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30374,5 +30451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30382,5 +30459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30389,5 +30466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30397,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30405,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30413,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30420,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30428,5 +30505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30436,5 +30513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30444,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30452,5 +30529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30459,5 +30536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30466,5 +30543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30473,5 +30550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30480,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30487,5 +30564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30494,5 +30571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30501,5 +30578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30508,5 +30585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30515,5 +30592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30522,5 +30599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30529,5 +30606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30536,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30543,5 +30620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30551,5 +30628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30559,5 +30636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30567,5 +30644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30575,5 +30652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30583,5 +30660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30591,5 +30668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30599,5 +30676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30607,5 +30684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30615,5 +30692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30624,5 +30701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30632,5 +30709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30640,5 +30717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30648,5 +30725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30656,5 +30733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30664,5 +30741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30672,5 +30749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30680,5 +30757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30688,5 +30765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30696,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30704,5 +30781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30712,5 +30789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30720,5 +30797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30728,5 +30805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30736,5 +30813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30744,5 +30821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30752,5 +30829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30760,5 +30837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30768,5 +30845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30776,5 +30853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30783,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30813,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30821,5 +30898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30829,7 +30906,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30844,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30852,5 +30929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30860,5 +30937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30868,5 +30945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30876,5 +30953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30884,5 +30961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30892,5 +30969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30906,7 +30983,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30916,5 +30993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30924,5 +31001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30932,5 +31009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30940,5 +31017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30948,5 +31025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30956,5 +31033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30964,5 +31041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30972,5 +31049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30980,5 +31057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30988,5 +31065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30996,5 +31073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31004,5 +31081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31012,5 +31089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31020,5 +31097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31028,5 +31105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31036,5 +31113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31044,5 +31121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31052,5 +31129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31060,5 +31137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31068,5 +31145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31076,5 +31153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31084,5 +31161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31092,5 +31169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31100,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31108,5 +31185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31116,5 +31193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31124,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31132,5 +31209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31140,5 +31217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31148,5 +31225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31156,5 +31233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31164,5 +31241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31172,5 +31249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31180,5 +31257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31188,5 +31265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31196,5 +31273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31204,5 +31281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31212,5 +31289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31220,5 +31297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31228,5 +31305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31236,5 +31313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31244,5 +31321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31278,7 +31355,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31288,5 +31365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31296,5 +31373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31304,5 +31381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31312,5 +31389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31320,5 +31397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31328,5 +31405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31336,5 +31413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31351,5 +31428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31359,5 +31436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31367,5 +31444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31375,5 +31452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31383,5 +31460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31391,5 +31468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31400,5 +31477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31408,5 +31485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31416,5 +31493,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31424,5 +31501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31431,5 +31508,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31438,5 +31515,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31454,7 +31531,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31464,5 +31541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31472,5 +31549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31480,5 +31557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31488,5 +31565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31496,5 +31573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31504,5 +31581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31512,5 +31589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31520,5 +31597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31528,5 +31605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31544,5 +31621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31556,5 +31633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31568,5 +31645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31576,5 +31653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31588,5 +31665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31600,6 +31677,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31609,5 +31686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31621,5 +31698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31633,5 +31710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31645,5 +31722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31657,5 +31734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31669,5 +31746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31677,7 +31754,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31687,5 +31764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31695,5 +31772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31703,5 +31780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31711,5 +31788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31726,5 +31803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31737,5 +31814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31749,5 +31826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31761,5 +31838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31773,5 +31850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31782,5 +31859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31790,5 +31867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31798,5 +31875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31806,5 +31883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31814,5 +31891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31829,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31841,5 +31918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31853,5 +31930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31865,5 +31942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31877,5 +31954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31890,5 +31967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
 #. XXX - maybe it's possible to use linemod's here?
@@ -31914,5 +31991,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31923,11 +32000,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31937,5 +32014,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31945,5 +32022,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31953,5 +32030,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31961,5 +32038,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31969,5 +32046,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31977,5 +32054,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31985,5 +32062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31993,5 +32070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32001,5 +32078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32009,5 +32086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32017,5 +32094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32025,5 +32102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32043,5 +32120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32136,5 +32213,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32142,28 +32219,28 @@
 #. relation    - a relation
 #. *           - all data types
-#.
+#. 
 #. Message type can be:
 #. E            - an error
 #. W            - a warning
 #. I            - an low priority informational warning
-#.
+#. 
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
 #. ends with // signs. If an 'i' is appended, the regular expression is
 #. case insensitive.
-#.
+#. 
 #. The * sign indicates any string.
 #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
 #. handling for boolean values (yes, true, 0, false, no, ...).
-#.
+#. 
 #. Expression can be:
 #. !=          - the key/value combination does not match
 #. ==          - the key/value combination does match
-#.
+#. 
 #. To have more complicated expressions, multiple elements can be grouped together
 #. with an logical and (&&).
-#.
+#. 
 #. The comment at the end of a rule is displayed in validator description
-#.
+#. 
 #. Empty lines and space signs are ignored
 #: build/trans_validator.java:38
@@ -32278,5 +32355,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32289,5 +32366,5 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#.
+#. 
 #. different forms for web access
 #. must be html:<url>
@@ -32312,6 +32389,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32320,6 +32397,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32334,6 +32411,6 @@
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#.
-#.
+#. 
+#. 
 #. only for Czech Republic
 #: build/trans_wms.java:27
@@ -32347,6 +32424,6 @@
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#.
-#.
+#. 
+#. 
 #. only for GB
 #. fails with division by zero error
@@ -32366,6 +32443,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32389,6 +32466,6 @@
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#.
-#.
+#. 
+#. 
 #. only for Italy
 #: build/trans_wms.java:46
@@ -32419,10 +32496,11 @@
 #~ msgstr "JOSM hjelpesider"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Feil ved nedlasting av {0}"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still want "
+#~ "to merge them?"
 #~ msgstr ""
 #~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles "
@@ -32442,9 +32520,8 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this as "
+#~ "a bug."
 #~ msgstr ""
-#~ "Feilmelding: cannot check conditions for no layer. Send inn en "
-#~ "feilmelding."
+#~ "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding."
 
 #~ msgid "No document open so nothing to save."
@@ -32461,9 +32538,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
 #~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -32480,4 +32557,5 @@
 #~ msgstr "Forventer parentes slutt."
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{0} konflikter må løses i {1} objecter"
@@ -32507,4 +32585,5 @@
 #~ msgstr "rett versjon"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32527,4 +32606,5 @@
 #~ msgstr "Konflikter ved sammenføyning."
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Kommandoliste: {0}"
@@ -32537,13 +32617,13 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "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."
+#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i historikk."
 
 #~ msgid "Delete the selected layer."
 #~ msgstr "Slett valgt Lag."
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Lag: {0}"
@@ -32573,7 +32653,9 @@
 #~ msgstr "Flytt ned"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relasjons-editor: {0}"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Opphavsmenn: {0}"
@@ -32612,16 +32694,21 @@
 #~ msgstr "Ingen bilder med lesbare tidsstempler funnet"
 
+#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Ingen tid gitt for punkt {0} x {1}"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Bilder for {0}"
 
+#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS start: {0}"
 
+#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "nåværende forskjell: {0}s"
 
+#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS-slutt: {0}"
@@ -32632,4 +32719,5 @@
 #~ msgstr[1] "bilder"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} innenfor sporet."
@@ -32649,4 +32737,7 @@
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 #~ msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Opprett markører uten lyd når GPX-data leses."
 
 #~ msgid "Update"
@@ -32726,4 +32817,5 @@
 #~ msgstr "Fandt <member>-element i en ikke-relation."
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32735,4 +32827,5 @@
 #~ " {0}"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -32740,26 +32833,28 @@
 #~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM."
 
+#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
 #~ msgstr ""
-#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned "
-#~ "automatisk."
-
+#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned automatisk."
+
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Fant ikke programtillegget: {0}."
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Programtillegget krever oppdatering {0} av JOSM."
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}"
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
+#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
+#~ "overwrite the existing ones."
 #~ msgstr ""
-#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang "
-#~ "til å skrive over eksisterende."
+#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang til å "
+#~ "skrive over eksisterende."
 
 #~ msgid ""
@@ -32767,6 +32862,6 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien "
-#~ "i oppstettet 'pluginmanager.warntime'.)"
+#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien i "
+#~ "oppstettet 'pluginmanager.warntime'.)"
 
 #~ msgid ""
@@ -32774,6 +32869,5 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM "
-#~ "utviklerne."
+#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne."
 
 #~ msgid "Download missing plugins"
@@ -32783,4 +32877,5 @@
 #~ msgstr "Programtillegg finnes allerede"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Venligst send en feilrapport på {0}"
@@ -32795,4 +32890,5 @@
 #~ msgstr "Husk å inkludere følgende informasjon:"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -32801,12 +32897,12 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Programtillegg lista er allerede tilgengelig.  Vil du laste ned ny "
-#~ "versjon over den eksisterende?\n"
+#~ "Programtillegg lista er allerede tilgengelig.  Vil du laste ned ny versjon "
+#~ "over den eksisterende?\n"
 #~ "\n"
 #~ "{0}"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before reporting "
+#~ "a bug."
 #~ msgstr ""
 #~ "Prøv å oppdatere til siste versjon av JOSM og alle programtillegg før du "
@@ -32827,20 +32923,21 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</"
-#~ "html>"
+#~ "<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</html>"
 
 #~ msgid "GPX Track loaded"
 #~ msgstr "GPX-spor er lagt inn"
 
+#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Fant {0} treff av {1} i GPX spor {2}"
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You can "
+#~ "adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell "
 #~ "kobling."
 
+#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Forskyvning mellom spor og foto: {0}m {1}s"
@@ -32855,4 +32952,5 @@
 #~ msgstr "Lambert Zone 4 cache file (.4)"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Bytt til kartprojeksjonen {0}."
@@ -32879,6 +32977,6 @@
 #~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "Lambert sone {0} i mellomlager  stemmer ikke med aktiv Lambert sone {1}"
@@ -32947,10 +33045,11 @@
 #~ msgstr "Hjelp / Om"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -32967,6 +33066,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
-#~ "in this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
+#~ "this example,replacing 73 with your image 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"
@@ -32975,6 +33074,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger "
-#~ "- disse vil vises i WMS menyen.\n"
+#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger - "
+#~ "disse vil vises i WMS menyen.\n"
 #~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
@@ -32987,17 +33086,16 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må "
-#~ "du bare oppgi gyldig 'id'.\n"
-#~ "Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i "
-#~ "dette eksempelet. Bytt ut  73 med din bilde id: \n"
+#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må du "
+#~ "bare oppgi gyldig 'id'.\n"
+#~ "Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i dette "
+#~ "eksempelet. Bytt ut  73 med din bilde 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"
-#~ "OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i "
-#~ "tvil: la være å bruke bildet."
+#~ "OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i tvil: "
+#~ "la være å bruke bildet."
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr ""
-#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
+#~ msgstr "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
 
 #~ msgid "Please select the row to copy."
@@ -33013,6 +33111,6 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
+#~ "eg. deleting uninteresting parts of track."
 #~ msgstr ""
 #~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. "
@@ -33057,6 +33155,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want to "
+#~ "combine them?"
 #~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?"
 
@@ -33077,4 +33175,5 @@
 #~ msgstr "Splitt linje i segment"
 
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n"
@@ -33084,6 +33183,6 @@
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
+#~ "jump to position."
 #~ msgstr ""
 #~ "Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå "
@@ -33108,4 +33207,5 @@
 #~ msgstr "sykkelkart"
 
+#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
@@ -33141,4 +33241,8 @@
 #~ msgstr "Datalag"
 
+#~ msgid "Errors during Download"
+#~ msgstr "Feil under nedlasting"
+
+#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -33148,7 +33252,9 @@
 #~ "intervall, for eksempel nodes:10-20"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Koble til {0} …"
 
+#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall."
@@ -33158,12 +33264,13 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have "
+#~ "downloaded.<br>This can cause problems because other objects (that you don't "
+#~ "see) might 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 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?"
-
+#~ "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?"
+
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan ikke åpne innstillingsmappe: {0}"
@@ -33195,6 +33302,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33211,4 +33317,5 @@
 #~ msgstr "Fant ikke fila"
 
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -33217,32 +33324,40 @@
 #~ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene"
 
+#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: "
-#~ "gjeldende er {0}, maksimalt er {1}"
+#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende "
+#~ "er {0}, maksimalt er {1}"
 
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Klarte ikke starte API. Prøv igjen senere."
 
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "multipolygon-linje «{0}» er ikke lukket."
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Linje «{0}» med færre enn to punkter."
 
+#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
 
+#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Multipolygon-medlem «{0}» er ikke en linje."
 
+#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Ingen ytre linje for multipolygon «{0}»."
 
+#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Skjæring mellom linjene «{0}» og «{1}»."
 
+#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Indre linje «{0}» er utenfor."
@@ -33257,11 +33372,9 @@
 #~ "Er du sikker på at du vil fortsette?"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ 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 på at du vil forenkle denne?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ 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?"
@@ -33303,4 +33416,5 @@
 #~ msgstr "Objekt allerede slettet"
 
+#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "fjerner henvisning fra vei {0}"
@@ -33315,4 +33429,5 @@
 #~ msgstr "OSM-brukernavn (e-post)"
 
+#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
@@ -33376,10 +33491,10 @@
 #~ "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."
+#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
+#~ "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 opphavspersoner/brukere. Velger kartdata fra valgt "
@@ -33422,7 +33537,9 @@
 #~ msgstr "Feil antall parametere for nodes-operator."
 
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Klarte ikke lese fra URL: «{0}»"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33438,7 +33555,9 @@
 #~ "Ikke last opp data etter denne beskjeden."
 
+#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33456,13 +33575,17 @@
 #~ "Ikke last opp data etter  denne meldingen."
 
+#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Klarte ikke tolke datoen i fila «{0}»."
 
+#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
 
+#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Feil i URL: «{0}»"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
@@ -33471,21 +33594,23 @@
 #~ msgstr "AgPifoJ – Geotaggede  bilder"
 
+#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
 
+#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+#~ "to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Det er {0} elementer i det lokale datasettet som<br>kan være "
-#~ "slettet på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere "
-#~ "dem, vil tjeneren sannsynligvis rapportere om en<br>konflikt."
-#~ "<br><br>Trykk <strong>{1}</strong> for å sjekke status for disse "
-#~ "elementene<br>på tjeneren.<br>Trykk <strong>{2}</strong> for å ignorere."
-#~ "<br></html>"
-
+#~ "<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>"
+
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -33494,6 +33619,6 @@
 #~ msgstr ""
 #~ "<html>Opplasting <strong>feilet</strong> fordi et element du prøvde "
-#~ "å<br>slette allerede er slettet på tjeneren.<br><br>Feilmelding:<br>{0}</"
-#~ "html>"
+#~ "å<br>slette allerede er slettet på "
+#~ "tjeneren.<br><br>Feilmelding:<br>{0}</html>"
 
 #~ msgid "parameter '{0}' must not be null"
@@ -33503,4 +33628,5 @@
 #~ msgstr "Bruk ufullstendige løsninger"
 
+#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
@@ -33516,6 +33642,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -33531,6 +33657,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
-#~ "in this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
+#~ "this example, replacing 73 with your image 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"
@@ -33542,6 +33668,6 @@
 #~ "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"
+#~ "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"
@@ -33560,7 +33686,8 @@
 #~ "&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."
-
+#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich "
+#~ "sind. Im Zweifel verzichten Sie auf die Nutzung."
+
+#, java-format
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Lag {0} må være i listen over lag"
@@ -33578,10 +33705,12 @@
 #~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12"
 
+#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
 
+#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A "
@@ -33592,19 +33721,23 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A HREF="
-#~ "\"{1}\">norsk bokmål</A>."
-
+#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A "
+#~ "HREF=\"{1}\">norsk bokmål</A>."
+
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parameter «{0}» må ha en verdi"
 
+#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Uventet returverdi. Mottok {0}."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
@@ -33616,4 +33749,5 @@
 #~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
@@ -33625,13 +33759,17 @@
 #~ msgstr "Fant ingen siste versjon. Historikken er tom."
 
+#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "parameter «current» utenfor rekkevidde: leste {0}"
 
+#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "Uventet kolonneindeks: {0}"
 
+#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
 
+#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "Indeks er utenfor rekkevidde: {0}"
@@ -33640,17 +33778,20 @@
 #~ msgstr "Vis historikken for det valgte objektet"
 
+#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Klarte ikke lese «{0}»"
 
+#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
+#~ "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}»"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parameter ''{0}'' kan ikke vœre null"
