Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 18847)
+++ applications/editors/josm/i18n/po/sv.po	(revision 18863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 13:30+0100\n"
+"POT-Creation-Date: 2009-11-29 16:20+0100\n"
 "PO-Revision-Date: 2009-11-17 18:09+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-11-29 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 21:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -74,5 +74,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
@@ -141,5 +141,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -333,5 +333,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -377,9 +377,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
-"</html>"
-msgstr ""
-"<html>Det finns inga lager som lagret <br>''{0}''<br>kan sammanfogas med.</"
-"html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
+"to.</html>"
+msgstr ""
+"<html>Det finns inga lager som lagret <br>''{0}''<br>kan sammanfogas "
+"med.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
@@ -448,7 +448,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228
-#, fuzzy
 msgid "Please enter a latitude in the range -90..90"
-msgstr "Ange ett användarnamn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236
@@ -457,7 +456,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239
-#, fuzzy
 msgid "Please enter a longitude in the range -180..180"
-msgstr "Ange ett användarnamn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275
@@ -466,5 +464,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
@@ -611,6 +609,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
 #, java-format
 msgid "View: {0}"
@@ -1462,5 +1460,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 ""
 "Visa statusrapport med information som kan vara av nytta vid felrapportering."
@@ -1612,5 +1611,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
-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 nod som används av mer än en sträcka samt en av dessa sträckor, eller"
@@ -1696,7 +1696,7 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
 msgid "Download data"
 msgstr ""
@@ -1788,8 +1788,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 ""
 
@@ -1804,13 +1805,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>Uppladdning <strong>misslyckades</strong eftersom servern har en nyare "
 "version<br>av någon av dina noder, vägar eller relationer.<br><br>Klicka på "
-"<strong>{0}</strong> för att synkronisera all lokal data med servern."
-"<br>Klicka på <strong>{1}</strong> för att avbryta och fortsätta redigera."
-"<br></html>"
+"<strong>{0}</strong> för att synkronisera all lokal data med "
+"servern.<br>Klicka på <strong>{1}</strong> för att avbryta och fortsätta "
+"redigera.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
@@ -1868,5 +1870,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611
 #, java-format
@@ -1888,5 +1890,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649
 #, 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 ""
 
@@ -1925,11 +1928,16 @@
 msgstr "Växla trådnätsvisning"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#. make numpad + behave like + (action is already registred)
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
+#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zooma ut"
@@ -2065,12 +2073,12 @@
 "deleted on the server. If you later try to delete or<br>update them the "
 "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
+"to check the state of these primitives<br>on the server.<br>Click "
+"<strong>{2}</strong> to ignore.<br></html>"
 msgstr ""
 "<html>Det finns {0} primitiver i din data som kanske<br> är borttagna från "
 "servern. Om du senare försöker ta bort eller<br> uppdatera de från servern "
-"kommer det troligtvis leda till<br> en konflikt.<br><br>Klicka på <strong>{1}"
-"</strong> för att kontrollera statusen på dessa primitiv<br> på servern."
-"<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
+"kommer det troligtvis leda till<br> en konflikt.<br><br>Klicka på "
+"<strong>{1}</strong> för att kontrollera statusen på dessa primitiv<br> på "
+"servern.<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
@@ -2220,6 +2228,6 @@
 #: ../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."
+"Drag play head and release near track to play audio from there; "
+"SHIFT+release to synchronize audio at that point."
 msgstr ""
 "Dra spelhuvudet och släpp i närheten av spår för att spela upp ljud "
@@ -2322,5 +2330,5 @@
 
 #. -- prepare the combo box with the search expressions
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
 msgid "Please enter a filter string."
@@ -2863,7 +2871,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
 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 håller på att ta bort noder utanför det område som du har hämtat hem.<br> "
@@ -3139,6 +3147,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 ""
 
@@ -3221,5 +3229,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3228,5 +3236,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3301,5 +3309,5 @@
 
 #. should not happen
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254
 #, java-format
@@ -3448,5 +3456,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114
 #, java-format
-msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3599,5 +3608,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
 msgid_plural "nodes"
@@ -3607,5 +3616,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
 msgid_plural "ways"
@@ -3616,5 +3625,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
 msgid_plural "relations"
@@ -3748,5 +3757,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 ""
 
@@ -3762,5 +3772,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
 msgid " [id: {0}]"
@@ -3894,5 +3904,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)"
+msgstr ""
+"Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
@@ -3932,5 +3943,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "If specified, reset the configuration instead of reading it."
-msgstr "Om angivet så återställ konfigurationen istället för att läsa in den."
+msgstr ""
+"Om angivet så återställ konfigurationen istället för att läsa in den."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
@@ -4270,5 +4282,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"
@@ -4277,5 +4289,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"
@@ -4284,5 +4296,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"
@@ -4480,5 +4492,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
-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 ""
 
@@ -4547,6 +4560,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 ""
 
@@ -4554,6 +4567,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 ""
 
@@ -4610,6 +4623,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
+"<html>An error occurred while communicating with the server<br>Details: "
+"{0}</html>"
 msgstr ""
 
@@ -4644,7 +4657,7 @@
 #, java-format
 msgid ""
-"<html>There are {0} additional primitives referred to by relation {1}"
-"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
-"</html>"
+"<html>There are {0} additional primitives referred to by relation "
+"{1}<br>which are deleted on the server.<br><br>Do you want to undelete them "
+"too?</html>"
 msgstr ""
 
@@ -5192,5 +5205,6 @@
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
-msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan."
+msgstr ""
+"Sätt urval av element på kartan till de valda posterna i listan ovan."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
@@ -5217,9 +5231,10 @@
 #, java-format
 msgid ""
-"<html>You didn''t finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You didn''t finish to merge the differences in this "
+"conflict.<br>Conflict resolutions won't be applied unless all "
+"differences<br>are resolved.Click <strong>{0}</strong> to close "
+"anyway.<strong>Already<br>resolved differences won't be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5712,6 +5727,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 ""
 
@@ -5729,6 +5744,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 ""
 
@@ -5864,6 +5879,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 ""
 
@@ -5929,5 +5945,5 @@
 
 #. download the relation
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427
 #, java-format
@@ -6010,5 +6026,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-msgid "Warning: ignoring exception because task was cancelled. Exception was: "
+msgid ""
+"Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
 
@@ -6167,5 +6184,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
 msgid "Download area too large; will probably be rejected by server"
-msgstr "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern."
+msgstr ""
+"Hämtningsområdet är alltför stort; kommer troligen avvisas av servern."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
@@ -6189,6 +6207,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 ""
 
@@ -6961,5 +6980,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7196,6 +7215,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>"
+"local language ({1})</a> and the <a href=\"{3}\">help topic in "
+"english</a>.</p></html>"
 msgstr ""
 
@@ -7205,6 +7224,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 ""
 
@@ -7574,5 +7593,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 ""
 
@@ -7657,6 +7677,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] ""
@@ -7670,6 +7690,6 @@
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which can't 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 can't be "
@@ -7943,5 +7963,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
 #, java-format
@@ -8049,5 +8069,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -8085,5 +8105,5 @@
 msgstr "Angiven tid kunde inte tolkas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
@@ -8091,30 +8111,30 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Use global settings."
 msgstr "Använd globala inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Draw lines between points for this layer."
 msgstr "Rita linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Do not draw lines between points for this layer."
 msgstr "Rita inte linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
 msgid "Select line drawing options"
 msgstr "Välj alternativ för linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
@@ -8122,5 +8142,5 @@
 msgstr "Anpassa färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -8129,5 +8149,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
@@ -8136,31 +8156,52 @@
 msgstr "Välj en färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:191
 msgid "Markers From Named Points"
 msgstr "Markörer från namngivna punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Namngivna spårpunkter från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
 msgid "Import Audio"
 msgstr "Importera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points don''t include a timestamp we can''t "
+"correlate them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:247
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-ljudfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:283
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Ljudmarkörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importera bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points don''t include a timestamp we can''t "
+"correlate them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
@@ -8168,5 +8209,5 @@
 msgstr "Namn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -8174,5 +8215,5 @@
 msgstr "Beskrivning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:388
 #, java-format
 msgid "{0} track"
@@ -8182,5 +8223,5 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
 #: build/trans_presets.java:3190
@@ -8188,22 +8229,22 @@
 msgstr "Beskrivning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Längd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -8212,5 +8253,5 @@
 msgstr[1] "{0} rutter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -8219,23 +8260,23 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
 "skicka in spår, se här:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88
@@ -8246,29 +8287,29 @@
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969
 msgid "Download from OSM along this track"
 msgstr "Hämta från OSM längs med detta spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
 #, java-format
 msgid ""
@@ -8279,9 +8320,9 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8291,5 +8332,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8393,6 +8434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 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 ""
 
@@ -8597,5 +8638,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Explicit waypoints with time estimated from track position."
-msgstr "Explicita sträckpunkter med tid uppskattad från position längs spåret."
+msgstr ""
+"Explicita sträckpunkter med tid uppskattad från position längs spåret."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
@@ -8940,5 +8982,6 @@
 #. drawGpsArrowsFast
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
-msgid "Draw the direction arrows using table lookups instead of complex math."
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Rita riktningspilar med hjälp av tabelluppslagning istället för komplicerad "
@@ -8982,5 +9025,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
+msgstr ""
+"Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
@@ -9003,5 +9047,6 @@
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
 
@@ -9343,6 +9388,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 ""
 
@@ -9407,6 +9452,6 @@
 "a menu entry of button for the first time. So some of your changes may "
 "become active even without restart --- but also without collistion 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 ""
 "<p>Dessutom så aktiveras kortkommandon när händelser knyts till en menyknapp "
@@ -9424,8 +9469,9 @@
 "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
 "there will be 'keys' listed that correspond to a shortcut on your keyboard "
-"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/"
-"Semicolon on US keyboards, '.'/Period on German keyboards, ...) 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>"
+"(e.g. ':'/Colon). Please also do not use them, use the base key "
+"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
+"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 ""
 "<p>Du kommer att märka att urvalslistan för tangenter på nästa sida "
@@ -9440,6 +9486,6 @@
 "tangentbord, '.'/punkt på tyska eller svenska tangentbor,...) istället. Om "
 "du inte gör så kan krockar uppstå, eftersom det inte finns något sätt för "
-"JOSM att veta att på ett amerikanskt tangentbord så är i själva verket Ctrl"
-"+Shift+; och Ctrl+: samma sak...</p>"
+"JOSM att veta att på ett amerikanskt tangentbord så är i själva verket "
+"Ctrl+Shift+; och Ctrl+: samma sak...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177
@@ -9468,6 +9514,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183
 msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
-"</p>"
+"<p>The pseudo-modifier 'disabled' will disable the shortcut when "
+"encountered.</p>"
 msgstr ""
 "<p>Pseudomodifieraren 'disabled' avaktiverar kortkommandot när detta "
@@ -9775,5 +9821,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115
 #, java-format
-msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -10087,7 +10134,7 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
+"<html>WARNING: The password is stored in plain text in the preferences "
+"file.<br>The password is transferred in plain text to the server, encoded in "
+"the URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -10115,6 +10162,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 ""
 
@@ -10183,6 +10230,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 ""
 
@@ -10212,5 +10259,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #, 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 ""
 
@@ -10502,5 +10550,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
-msgid "Loading of {0} plugin was requested. This plugin is no longer required."
+msgid ""
+"Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
@@ -10509,6 +10558,6 @@
 msgid ""
 "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-"developed and very likely will produce errors.<br>It should be disabled."
-"<br>Delete from preferences?</html>"
+"developed and very likely will produce errors.<br>It should be "
+"disabled.<br>Delete from preferences?</html>"
 msgstr ""
 
@@ -10523,5 +10572,6 @@
 #, java-format
 msgid "Last plugin update more than {0} days ago."
-msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
+msgstr ""
+"Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
@@ -10737,6 +10787,6 @@
 "<html><p>There the the error information provided below should already "
 "be<br>filled out for you. Please include information on how to "
-"reproduce<br>the error and try to supply as much detail as possible.</p></"
-"html>"
+"reproduce<br>the error and try to supply as much detail as "
+"possible.</p></html>"
 msgstr ""
 
@@ -10774,6 +10824,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>Uppladdning till servern <strong>misslyckades</strong> eftersom "
@@ -10838,6 +10888,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 ""
 
@@ -10849,7 +10900,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 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 ""
 
@@ -10881,17 +10932,15 @@
 "<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>"
+"<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:98
-#, fuzzy
 msgid "Loading available locales..."
-msgstr "Ställ in tillgängliga insticksmoduler."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-#, fuzzy
 msgid "Checking locales..."
-msgstr "kontrollerar cache..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
@@ -10935,6 +10984,6 @@
 "\n"
 msgstr ""
-"Det gick inte att tilldela kortkommandot ''{0}'' till handlingen "
-"''{1}'' ({2})\n"
+"Det gick inte att tilldela kortkommandot ''{0}'' till handlingen ''{1}'' "
+"({2})\n"
 "eftersom detta kortkommando redan används för handlingen ''{3}'' ({4}).\n"
 "\n"
@@ -11394,7 +11443,7 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224
 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>"
+"<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 ett foto av din GPS-mottagare när den visar tiden.<br>Visa detta "
@@ -11464,8 +11513,9 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
-msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-msgstr ""
-"<html>Jag kan ta en bild av min GPS-mottagare.<br>Kan detta vara till nytta?"
-"</html>"
+msgid ""
+"<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+msgstr ""
+"<html>Jag kan ta en bild av min GPS-mottagare.<br>Kan detta vara till "
+"nytta?</html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
@@ -11761,10 +11811,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 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."
+"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 ""
 
@@ -12413,6 +12464,6 @@
 msgstr ""
 "Kan inte hämta biblioteket rxtxSerial. Om du behöver assistans med att "
-"installera detta, så läs globalsats hemsida på http://www.raphael-mack.de/"
-"josm-globalsat-gpx-import-plugin/"
+"installera detta, så läs globalsats hemsida på http://www.raphael-"
+"mack.de/josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105
@@ -12555,5 +12606,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:187
 msgid "Running vertex reduction..."
@@ -12615,7 +12666,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -12625,5 +12676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -12633,5 +12684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="drain"/>
@@ -12640,5 +12691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -12648,5 +12699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -12724,5 +12775,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
-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 ""
 "Största antal delsträckor som tillåts i varje skapad sträcka. Förval 250."
@@ -12746,6 +12798,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 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 ""
 "Noggrannhet för Douglas-Peuckers linjeförenkling, mätt i grader.<br>Lägre "
@@ -13046,5 +13099,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 ""
 "Huvudet innehåller flera värden och kan inte mappas till en enda sträng"
@@ -13174,5 +13228,6 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer."
+msgstr ""
+"En insticksmodul som låter JOSM kontrolleras från andra applikationer."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
@@ -13686,5 +13741,6 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 msgid "Opens a dialog that allows to jump to a specific location"
-msgstr "Öppnar en dialogruta som gör att man kan gå direkt till en viss plats"
+msgstr ""
+"Öppnar en dialogruta som gör att man kan gå direkt till en viss plats"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54
@@ -14204,5 +14260,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:608
 msgid "Validate property values and tags using complex rules."
-msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler."
+msgstr ""
+"Validera egenskapsvärden och taggar med hjälp av komplicerade regler."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:629
@@ -14216,6 +14273,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or 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 ""
 "De källor (URL eller filnamn) som används för att stavningskontrollera (läs "
@@ -14363,5 +14421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -14369,5 +14427,5 @@
 #. <linemod mode="under" width="10" colour="#808000"/>
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -14377,5 +14435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -14384,5 +14442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -14391,5 +14449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -14398,5 +14456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -14405,5 +14463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -14412,9 +14470,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building" b="yes"/>
@@ -14459,5 +14517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -14920,5 +14978,5 @@
 #. 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
 msgid ""
@@ -15022,5 +15080,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 ""
 
@@ -16241,8 +16300,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"/>
@@ -16439,5 +16498,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -16447,5 +16506,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -16464,5 +16523,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -16472,5 +16531,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -16489,5 +16548,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -16497,5 +16556,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -16514,5 +16573,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -16522,5 +16581,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -16535,5 +16594,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -16551,5 +16610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -16567,5 +16626,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -16574,5 +16633,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -16582,5 +16641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -16600,5 +16659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -16607,5 +16666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -16615,5 +16674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -16663,7 +16722,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -17362,5 +17421,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:932
@@ -17399,5 +17458,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:954
@@ -17493,5 +17552,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -17648,5 +17707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -19033,5 +19092,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -19041,5 +19100,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -19049,5 +19108,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -19057,5 +19116,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -19413,7 +19472,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -19423,5 +19482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -19431,5 +19490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -19439,5 +19498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -19447,5 +19506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -19455,5 +19514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -19463,5 +19522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -19471,5 +19530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -19479,5 +19538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -19487,5 +19546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -19495,5 +19554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -19503,5 +19562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -19511,5 +19570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -19519,5 +19578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -19527,5 +19586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -19535,5 +19594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -19543,5 +19602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -19551,5 +19610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -19559,5 +19618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -19567,5 +19626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -19575,5 +19634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -19583,5 +19642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -19591,5 +19650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -19599,5 +19658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -19607,5 +19666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -19615,5 +19674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -19623,5 +19682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -19631,5 +19690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -19639,5 +19698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -19647,5 +19706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -19655,5 +19714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -19663,5 +19722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -19671,5 +19730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -19679,5 +19738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -19687,5 +19746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -19695,5 +19754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -19703,5 +19762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -19711,5 +19770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -19719,5 +19778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -19727,5 +19786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -19735,5 +19794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -19743,5 +19802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -19751,5 +19810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -19759,5 +19818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -19767,5 +19826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -19775,5 +19834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -19783,5 +19842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -21475,7 +21534,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -21485,5 +21544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -21493,5 +21552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -21501,5 +21560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -21509,5 +21568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -21517,5 +21576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -21525,5 +21584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -21533,5 +21592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -22862,5 +22921,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -22876,5 +22935,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -22885,7 +22944,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -22895,5 +22954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -22903,5 +22962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -22911,5 +22970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -22919,5 +22978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -22950,5 +23009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -22964,5 +23023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -22972,5 +23031,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -22980,5 +23039,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -22989,5 +23048,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -23016,5 +23075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -23129,9 +23188,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 rbest 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
@@ -23139,5 +23198,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,
@@ -23147,8 +23206,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
@@ -23162,5 +23221,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -23168,5 +23227,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -23215,6 +23274,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>
@@ -23294,5 +23353,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -23302,5 +23361,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -23309,5 +23368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -23317,5 +23376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -23324,5 +23383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -23331,5 +23390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -23338,5 +23397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -23345,5 +23404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -23352,5 +23411,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -23359,5 +23418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="gate"/>
@@ -23366,5 +23425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cattle_grid"/>
@@ -23373,5 +23432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="toll_booth"/>
@@ -23380,5 +23439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -23387,5 +23446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -23394,5 +23453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="viaduct"/>
@@ -23402,5 +23461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="viaduct"/>
@@ -23409,5 +23468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <!-- deprecated; use information=guidepost instead -->
@@ -23418,5 +23477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="marsh"/>
@@ -23428,11 +23487,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -23441,7 +23500,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--"deprecated" tags -->
-#.
+#. 
 #. <!-- historic=museum -> tourism=museum -->
 #. <rule>
@@ -23452,5 +23511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_wind -> power=generator and power_source=wind -->
 #. <rule>
@@ -23461,5 +23520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_hydro -> power=generator and power_source=hydro -->
 #. <rule>
@@ -23470,5 +23529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_fossil -> power=generator and power_source=fossil -->
 #. <rule>
@@ -23479,5 +23538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
 #. <rule>
@@ -23488,5 +23547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway classification now more detailed -->
 #. <rule>
@@ -23497,5 +23556,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- amenity=park_bench -> amenity=bench -->
 #. <rule>
@@ -23507,5 +23566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway=stile -> barrier=stile -->
 #. <rule>
@@ -23516,5 +23575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
 #. <rule>
@@ -23539,5 +23598,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -23546,5 +23605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -23553,5 +23612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -23567,5 +23626,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -23579,5 +23638,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -23586,5 +23645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -23593,5 +23652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -23600,5 +23659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -23607,5 +23666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -23614,5 +23673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -23621,5 +23680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -23628,5 +23687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -23635,5 +23694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -23642,5 +23701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -23649,5 +23708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -23656,5 +23715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -23663,5 +23722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -23670,5 +23729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -23677,5 +23736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -23846,7 +23905,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -23860,5 +23919,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -23868,7 +23927,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -23878,5 +23937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -23886,5 +23945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -23894,5 +23953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -23902,5 +23961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -23916,5 +23975,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23924,5 +23983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23932,5 +23991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23940,5 +23999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23948,5 +24007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23956,5 +24015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23964,5 +24023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23981,5 +24040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -23988,5 +24047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -24000,5 +24059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -24012,5 +24071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -24019,5 +24078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -24031,5 +24090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -24044,5 +24103,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -24057,5 +24116,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -24069,5 +24128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -24081,5 +24140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -24088,5 +24147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -24095,5 +24154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
@@ -24107,5 +24166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -24115,5 +24174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -24122,5 +24181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -24129,5 +24188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -24136,5 +24195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -24144,5 +24203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -24153,5 +24212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -24161,7 +24220,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -24171,5 +24230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -24179,5 +24238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -24187,5 +24246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -24196,5 +24255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -24204,5 +24263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -24212,5 +24271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -24220,5 +24279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -24228,5 +24287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -24236,5 +24295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -24244,5 +24303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -24252,5 +24311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -24260,5 +24319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -24281,7 +24340,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -24291,5 +24350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -24298,5 +24357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -24306,5 +24365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -24313,5 +24372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -24321,5 +24380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -24329,5 +24388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -24343,5 +24402,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -24352,5 +24411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -24369,5 +24428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -24377,5 +24436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24388,5 +24447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24404,5 +24463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -24411,5 +24470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -24418,5 +24477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -24425,7 +24484,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -24436,5 +24495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -24449,5 +24508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -24461,5 +24520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -24469,5 +24528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -24481,5 +24540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -24493,5 +24552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -24500,7 +24559,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -24510,5 +24569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -24518,5 +24577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -24526,5 +24585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -24534,5 +24593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -24548,7 +24607,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -24563,5 +24622,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -24576,5 +24635,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -24589,5 +24648,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -24602,5 +24661,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -24615,5 +24674,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -24628,7 +24687,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -24638,5 +24697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -24645,5 +24704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -24653,5 +24712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -24661,5 +24720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -24669,5 +24728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -24677,5 +24736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -24685,5 +24744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -24693,5 +24752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -24701,5 +24760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -24709,5 +24768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -24717,5 +24776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -24725,5 +24784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -24733,5 +24792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -24751,5 +24810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -24764,5 +24823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -24775,7 +24834,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -24785,5 +24844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -24793,5 +24852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -24801,5 +24860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -24809,5 +24868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -24817,5 +24876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -24825,5 +24884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -24833,5 +24892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -24841,5 +24900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -24849,5 +24908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -24857,5 +24916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -24865,5 +24924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -24873,5 +24932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -24881,5 +24940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -24889,5 +24948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -24908,5 +24967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -24920,7 +24979,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -24930,5 +24989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -24938,5 +24997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -24946,5 +25005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -24954,5 +25013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -24962,5 +25021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -24970,5 +25029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -24978,5 +25037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -24993,5 +25052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -25001,5 +25060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -25009,5 +25068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -25017,5 +25076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -25025,5 +25084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -25033,5 +25092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -25041,5 +25100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -25049,5 +25108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -25057,5 +25116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -25065,5 +25124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -25073,5 +25132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -25081,5 +25140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -25098,5 +25157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -25106,5 +25165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -25113,5 +25172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -25121,5 +25180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -25129,5 +25188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -25137,5 +25196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -25144,5 +25203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -25152,5 +25211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -25160,5 +25219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -25168,5 +25227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -25176,5 +25235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -25183,5 +25242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -25190,5 +25249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -25197,5 +25256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -25204,5 +25263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -25211,5 +25270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -25218,5 +25277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -25225,5 +25284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -25232,5 +25291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -25239,5 +25298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -25246,5 +25305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -25253,5 +25312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -25260,5 +25319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -25267,5 +25326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -25275,5 +25334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -25283,5 +25342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -25291,5 +25350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -25299,5 +25358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -25307,5 +25366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -25315,5 +25374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -25323,5 +25382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -25331,5 +25390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -25339,5 +25398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -25348,5 +25407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -25356,5 +25415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -25364,5 +25423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -25372,5 +25431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -25380,5 +25439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -25388,5 +25447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -25396,5 +25455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -25404,5 +25463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -25412,5 +25471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -25420,5 +25479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -25428,5 +25487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -25436,5 +25495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -25444,5 +25503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -25452,5 +25511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -25460,5 +25519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -25468,5 +25527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -25476,5 +25535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -25484,5 +25543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -25492,5 +25551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -25499,5 +25558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -25529,5 +25588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -25537,5 +25596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -25545,7 +25604,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -25560,5 +25619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -25568,5 +25627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -25576,5 +25635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -25584,5 +25643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -25592,5 +25651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -25600,5 +25659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -25608,5 +25667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -25622,7 +25681,7 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -25632,5 +25691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -25640,5 +25699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -25648,5 +25707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -25656,5 +25715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -25664,5 +25723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -25672,5 +25731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -25680,5 +25739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -25688,5 +25747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -25696,5 +25755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -25704,5 +25763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -25712,5 +25771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -25720,5 +25779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -25728,5 +25787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -25736,5 +25795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -25744,5 +25803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -25752,5 +25811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -25760,5 +25819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -25768,5 +25827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -25776,5 +25835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -25784,5 +25843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -25792,5 +25851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -25800,5 +25859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -25808,5 +25867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -25816,5 +25875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -25824,5 +25883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -25832,5 +25891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -25840,5 +25899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -25848,5 +25907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -25856,5 +25915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -25864,5 +25923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -25872,5 +25931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -25880,5 +25939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -25888,5 +25947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -25896,5 +25955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -25904,5 +25963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -25912,5 +25971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -25920,5 +25979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -25928,5 +25987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -25936,5 +25995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -25944,5 +26003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -25952,5 +26011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -25960,5 +26019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -25994,7 +26053,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -26004,5 +26063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -26012,5 +26071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -26020,5 +26079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -26028,5 +26087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -26036,5 +26095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -26044,5 +26103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -26052,5 +26111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -26067,5 +26126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -26075,5 +26134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -26083,5 +26142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -26091,5 +26150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -26099,5 +26158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -26107,5 +26166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -26116,5 +26175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -26124,5 +26183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -26132,5 +26191,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -26140,5 +26199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -26147,5 +26206,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -26154,5 +26213,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -26170,7 +26229,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -26180,5 +26239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -26188,5 +26247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -26196,5 +26255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -26204,5 +26263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -26212,5 +26271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -26220,5 +26279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -26228,5 +26287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -26236,5 +26295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -26244,5 +26303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -26261,5 +26320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -26273,5 +26332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -26285,5 +26344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -26293,5 +26352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -26305,5 +26364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
@@ -26317,5 +26376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -26329,6 +26388,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -26338,5 +26397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -26350,5 +26409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -26362,5 +26421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -26374,5 +26433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -26386,5 +26445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -26398,5 +26457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -26406,7 +26465,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -26416,5 +26475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -26424,5 +26483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -26432,5 +26491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -26440,5 +26499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -26455,5 +26514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -26466,5 +26525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -26478,5 +26537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -26490,5 +26549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -26502,5 +26561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -26511,5 +26570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -26519,5 +26578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -26527,5 +26586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -26535,5 +26594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -26543,5 +26602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -26558,5 +26617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -26570,5 +26629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -26582,5 +26641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -26594,5 +26653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -26606,5 +26665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -26618,5 +26677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -26625,7 +26684,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -26635,5 +26694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -26643,5 +26702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -26651,5 +26710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -26659,5 +26718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -26667,5 +26726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -26675,5 +26734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -26683,5 +26742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
@@ -26698,7 +26757,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -26708,5 +26767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -26716,5 +26775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -26724,5 +26783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -26732,5 +26791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
@@ -26746,5 +26805,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?
@@ -26770,5 +26829,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -26779,11 +26838,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -26793,5 +26852,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -26801,5 +26860,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -26809,5 +26868,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -26817,5 +26876,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -26825,5 +26884,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -26833,5 +26892,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -26841,5 +26900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -26849,5 +26908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -26857,5 +26916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -26865,5 +26924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -26873,5 +26932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -26881,5 +26940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -26899,5 +26958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -26906,5 +26965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -26913,5 +26972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -26920,5 +26979,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -26927,5 +26986,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -26934,5 +26993,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -27027,5 +27086,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -27033,28 +27092,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
@@ -27169,5 +27228,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -27180,5 +27239,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>
@@ -27203,6 +27262,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -27211,6 +27270,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -27225,6 +27284,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
@@ -27238,6 +27297,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
@@ -27257,6 +27316,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -27280,6 +27339,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
@@ -27292,22 +27351,4 @@
 msgstr ""
 
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Lämna in en rapport på {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat "
-#~ "som möjligt)!"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Innan du rapporterar in ett fel, försök först att uppdatera till den "
-#~ "nyaste versionen av JOSM och alla insticksmoduler."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Följande information måste finnas med:"
-
 #~ msgid "Move"
 #~ msgstr "Flytta"
@@ -27352,4 +27393,5 @@
 #~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Fel vid inläsning av sida{0}"
@@ -27359,9 +27401,8 @@
 
 #~ 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 valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
-#~ "dem?"
+#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -27372,7 +27413,9 @@
 #~ "Det finns inte något öppet dokument, så det finns inte något att spara."
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Jämka {0} konflikter i {1} objekt"
 
+#, java-format
 #~ msgid "Delete {1} {0}"
 #~ msgstr "Ta bort {1} {0}"
@@ -27399,4 +27442,5 @@
 #~ msgstr "deras version:"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -27460,7 +27504,7 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
-#~ "servern."
-
+#~ "Tips: Några av ändringarna härrör från inskickning av nya data till servern."
+
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
@@ -27473,4 +27517,5 @@
 #~ "JOSM från."
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Använd snabbval ''{0}''"
@@ -27518,4 +27563,5 @@
 #~ msgstr "Navigation"
 
+#, java-format
 #~ msgid "requested: {0}"
 #~ msgstr "begärd: {0}"
@@ -27540,6 +27586,6 @@
 
 #~ 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 ""
 #~ "Återställ alla de nu valda objekten till den version som valts i "
@@ -27547,13 +27593,13 @@
 
 #~ 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 ""
-#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop "
-#~ "dem?"
+#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?"
 
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
@@ -27566,10 +27612,23 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning "
-#~ "visas<br> med hjälp av inställningen 'pluginmanager.warntime'.)"
+#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning visas<br> "
+#~ "med hjälp av inställningen 'pluginmanager.warntime'.)"
+
+#, java-format
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Lämna in en rapport på {0}"
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Följande information måste finnas med:"
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr ""
+#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat som "
+#~ "möjligt)!"
 
 #~ msgid "Edit Properties"
 #~ msgstr "Redigera egenskaper"
 
+#, java-format
 #~ msgid "Error deleting plugin file: {0}"
 #~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}"
@@ -27600,4 +27659,5 @@
 #~ msgstr "Id för Metacartas korrigerade kartbild"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "korrigeringsid={0}"
@@ -27636,7 +27696,15 @@
 #~ msgstr "cykelkarta"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
 
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before reporting "
+#~ "a bug."
+#~ msgstr ""
+#~ "Innan du rapporterar in ett fel, försök först att uppdatera till den nyaste "
+#~ "versionen av JOSM och alla insticksmoduler."
+
 #~ msgid "Found <member> element in non-relation."
 #~ msgstr "Fann <member>-tagg utanför relation."
@@ -27647,10 +27715,10 @@
 #~ msgid ""
 #~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ "file.<br>The password is transfered in plain text to the server, encoded in "
+#~ "the URL.<br><b>Do not use a valuable Password.</b></html>"
 #~ msgstr ""
-#~ "<html>VARNING: Lösenordet lagras okryperat i inställningsfilen."
-#~ "<br>Lösenordet skickas okryperat till servern, som en del av URL:en."
-#~ "<br><b>Använd inte ett värdefullt lösenord.</b></html>"
+#~ "<html>VARNING: Lösenordet lagras okryperat i "
+#~ "inställningsfilen.<br>Lösenordet skickas okryperat till servern, som en del "
+#~ "av URL:en.<br><b>Använd inte ett värdefullt lösenord.</b></html>"
 
 #~ msgid ""
@@ -27666,6 +27734,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 "
@@ -27682,6 +27750,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"
@@ -27693,6 +27761,6 @@
 #~ "inställningsfliken för WMSplugin - dessa kommer att synas i WMS-menyn.\n"
 #~ "\n"
-#~ "Du kan också göra dessa ändringar manuellt under avancerade "
-#~ "inställningar, enligt följande mall:\n"
+#~ "Du kan också göra dessa ändringar manuellt under avancerade inställningar, "
+#~ "enligt följande mall:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -27704,14 +27772,13 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/"
-#~ "rectifier/ , så behöver du enbart ange relevant 'id'.\n"
-#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, "
-#~ "skapa manuellt en url som i följande exempel och ersätt 73 med id för din "
-#~ "bild: \n"
+#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/rectifier/ , "
+#~ "så behöver du enbart ange relevant 'id'.\n"
+#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, skapa "
+#~ "manuellt en url som i följande exempel och ersätt 73 med id för din bild: \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"
-#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du "
-#~ "är tveksam så använd inte den."
+#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du är "
+#~ "tveksam så använd inte den."
 
 #~ msgid "Portcullis"
@@ -27725,10 +27792,10 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Servern svarade med internt fel. Försök med ett mindre område eller "
-#~ "försök igen efter en stund."
-
+#~ "Servern svarade med internt fel. Försök med ett mindre område eller försök "
+#~ "igen efter en stund."
+
+#, 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 ""
 #~ "Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt."
@@ -27737,4 +27804,5 @@
 #~ msgstr "Skicka in till OSM..."
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -27751,4 +27819,5 @@
 #~ msgstr "Tom medlem i relationen."
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan inte öppna inställningsmappen: {0}"
@@ -27775,10 +27844,13 @@
 #~ msgstr "Ersätter urvalet med användarens data"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Upphovsmän: {0}"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Lager: {0}"
 
+#, java-format
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Konflikter: {0}"
@@ -27804,11 +27876,10 @@
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
-#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och "
-#~ "panorera."
-
+#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och panorera."
+
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr ""
-#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: "
-#~ "{0}\n"
+#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: {0}\n"
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
@@ -27853,9 +27924,9 @@
 
 #~ 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 ""
-#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. "
-#~ "Rapportera in detta som ett fel."
+#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. Rapportera "
+#~ "in detta som ett fel."
 
 #~ msgid "Delete Layer"
@@ -27876,6 +27947,6 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
-#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du "
-#~ "skickar in det."
+#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du skickar "
+#~ "in det."
 
 #~ msgid "sports"
@@ -27885,4 +27956,5 @@
 #~ msgstr "Flytta nedåt"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relationsredigerare:{0}"
@@ -27898,14 +27970,15 @@
 #~ "skickats in har en historik."
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du "
-#~ "fortsätta?"
+#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du fortsätta?"
 
 #~ msgid "Update Data"
 #~ msgstr "Uppdatera data"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Ändra projektionen till {0} först."
@@ -27921,9 +27994,8 @@
 
 #~ 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 som behövde uppdateras hittades. Har du redan öppnat eller "
-#~ "laddat ner ett datalager?"
+#~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller laddat "
+#~ "ner ett datalager?"
 
 #~ msgid "Remove route nodes"
@@ -27933,4 +28005,5 @@
 #~ msgstr "Slå ihop sträckor med olika roller?"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -27952,4 +28025,5 @@
 #~ msgstr "Ångrar radering av väg..."
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Kontrollerar huruvida nod {0} är borta..."
@@ -27958,30 +28032,30 @@
 #~ msgstr "Återskapar relation..."
 
+#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrollerar huruvida primitiv {0} är borta..."
 
+#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
+#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
+#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
+#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
+#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av "
-#~ "en annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla "
-#~ "ditt primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv "
-#~ "kommer att tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att "
-#~ "acceptera det nya tillståndet på servern och radera ditt primitiv."
-#~ "<br>Klicka <strong>{3}</strong> för att avbryta.<br>"
-
+#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av en "
+#~ "annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla ditt "
+#~ "primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv kommer att "
+#~ "tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att acceptera det "
+#~ "nya tillståndet på servern och radera ditt primitiv.<br>Klicka "
+#~ "<strong>{3}</strong> för att avbryta.<br>"
+
+#, java-format
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
+#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
 #~ msgstr ""
-#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för "
-#~ "individuell uppdatering. Vänligen reducera<br>urvalet till max {1} "
-#~ "primitiv.</html>"
+#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för individuell "
+#~ "uppdatering. Vänligen reducera<br>urvalet till max {1} primitiv.</html>"
 
 #~ msgid "Selection too big"
@@ -28021,4 +28095,5 @@
 #~ msgstr "Inga data"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -28027,7 +28102,8 @@
 #~ msgstr ""
 #~ "<html>Uppladdning <strong>misslyckades</strong> eftersom en primitiv du "
-#~ "försökte<br>ta bort från servern redan är borttagen."
-#~ "<br><br>Felmeddelandet är:<br>{0}</html>"
-
+#~ "försökte<br>ta bort från servern redan är borttagen.<br><br>Felmeddelandet "
+#~ "är:<br>{0}</html>"
+
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -28037,7 +28113,9 @@
 #~ "primitiven."
 
+#, java-format
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Radera relationsmedlem {0} {1}"
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -28045,9 +28123,7 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 #~ msgstr[0] ""
-#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och "
-#~ "fortsätt?"
+#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?"
 #~ msgstr[1] ""
-#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och "
-#~ "fortsätt?"
+#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?"
 
 #~ msgid "Download referrers from OSM..."
@@ -28057,13 +28133,15 @@
 #~ msgstr "Laddar ner referenser..."
 
+#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</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 ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
+#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A "
+#~ "HREF=\"{1}\">ditt språk</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -28071,10 +28149,11 @@
 
 #~ 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 ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
-
+#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A "
+#~ "HREF=\"{1}\">ditt språk</A>."
+
+#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "oförväntat returvärde. Erhöll {0}"
