Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 18847)
+++ applications/editors/josm/i18n/po/sk.po	(revision 18863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 13:30+0100\n"
-"PO-Revision-Date: 2009-11-29 10:38+0000\n"
+"POT-Creation-Date: 2009-11-29 16:20+0100\n"
+"PO-Revision-Date: 2009-11-29 14:13+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-11-29 12:13+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 21:04+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
@@ -336,5 +336,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
@@ -380,9 +380,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
-"</html>"
-msgstr ""
-"<html>Nie sú tam vrstvy zdrojovej vrstvy<br>''{0}''<br>nemôžu byť zlúčené.</"
-"html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
+"to.</html>"
+msgstr ""
+"<html>Nie sú tam vrstvy zdrojovej vrstvy<br>''{0}''<br>nemôžu byť "
+"zlúčené.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
@@ -447,22 +447,18 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225
-#, fuzzy
 msgid "Please enter a valid latitude in the range -90..90"
-msgstr "Prosím vložte vybraný reťazec"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228
-#, fuzzy
 msgid "Please enter a latitude in the range -90..90"
-msgstr "Prosím vložte vybraný reťazec"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236
-#, fuzzy
 msgid "Please enter a valid longitude in the range -180..180"
-msgstr "Prosím vložte vybraný reťazec"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239
-#, fuzzy
 msgid "Please enter a longitude in the range -180..180"
-msgstr "Prosím vložte vybraný reťazec"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275
@@ -471,5 +467,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
@@ -484,12 +480,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276
-#, fuzzy
 msgid "Close the dialog and create a new node"
-msgstr "Zavrieť dialóg a zrušiť sťahovanie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289
-#, fuzzy
 msgid "Close the dialog, don't create a new node"
-msgstr "Vzdialená Správa s spýtala na vytvorenie nového bodu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
@@ -618,6 +612,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}"
@@ -1034,5 +1028,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
+msgstr ""
+"Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -1086,5 +1081,6 @@
 msgid ""
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
-msgstr "Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná."
+msgstr ""
+"Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
@@ -1469,5 +1465,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 ""
 "Zobraziť správu o stave s užitočnými informáciami, ktoré sa môžu viazať ku "
@@ -1562,6 +1559,6 @@
 msgstr ""
 "<html>Funkcia umiestnená v relačnom člene bola skopírovaná do všetkých "
-"nových ciest.<br>Mali by ste toto potvrdiť a opraviť to ak je to potrebné.</"
-"html>"
+"nových ciest.<br>Mali by ste toto potvrdiť a opraviť to ak je to "
+"potrebné.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377
@@ -1630,5 +1627,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 ""
 "* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo"
@@ -1712,7 +1710,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 "Sťahujem dáta"
@@ -1806,15 +1804,16 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Aktualizácia <strong>neúspešná</strong> pretože server ná novú verziu "
 "jednu z<br>vaších bodov, ciest, alebo relácií.<br>Konflikt je zapríčinený "
-"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu {2},"
-"vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu iba "
-"sporných  pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu celej "
-"lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
+"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu "
+"{2},vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu "
+"iba sporných  pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu "
+"celej lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
 "zrušenie a pokračovanie v editácii.<br></html>"
 
@@ -1829,12 +1828,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>Nahrávanie <strong>neúspešné</strong> pretože server má novú verziu "
-"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click <strong>{0}</"
-"strong>pre synchronizáciu celej lokálnej dátovej sady so serverom.<br>Click "
-"<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
+"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click "
+"<strong>{0}</strong>pre synchronizáciu celej lokálnej dátovej sady so "
+"serverom.<br>Click <strong>{1}</strong> pre zrušenie a pokračovanie v "
+"editácii.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
@@ -1901,5 +1902,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611
 #, java-format
@@ -1923,5 +1924,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 ""
 "Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
@@ -1961,11 +1963,16 @@
 msgstr "Prepnúť drôtový model"
 
-#: ../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 "Priblížiť"
 
-#: ../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 "Oddialiť"
@@ -2103,12 +2110,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>Je tam {0} pôvodných vo vašej lokálnej dátovej sade, ktoré<br>ktoré by "
 "mohli byť zmazané zo servera. Ak pozdejšie skúsite zmazať, "
-"alebo<br>aktualizovať ich server pravdepodobne ohlási<br>konflikt."
-"<br><br>Click <strong>{1}</strong>kontrola stavutýchto pôvodných<br>na "
-"servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
+"alebo<br>aktualizovať ich server pravdepodobne "
+"ohlási<br>konflikt.<br><br>Click <strong>{1}</strong>kontrola stavutýchto "
+"pôvodných<br>na servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
@@ -2262,6 +2269,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 ""
 "Ťahajte \"play head\" a uvoľnite ho blízko miesta odkadiaľ chcete zvukový "
@@ -2366,5 +2373,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."
@@ -2426,6 +2433,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - kľúč 'type' s nejakou hodnotou. Skúste tiež <b>*=hodnota</"
-"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+"<b>type=*</b> - kľúč 'type' s nejakou hodnotou. Skúste tiež "
+"<b>*=hodnota</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
@@ -2445,6 +2452,6 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>type:</b> - typy objektov (<b>bod</b>, <b>cesta</b>, <b>vzťah(relácia)</"
-"b>)"
+"<b>type:</b> - typy objektov (<b>bod</b>, <b>cesta</b>, "
+"<b>vzťah(relácia)</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
@@ -2501,5 +2508,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-msgstr "Použite <b>\"</b> ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)"
+msgstr ""
+"Použite <b>\"</b> ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
@@ -2722,6 +2730,6 @@
 "dependency.</html>"
 msgstr ""
-"<html>{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké iné."
-"<br>JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte cyklické "
+"<html>{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké "
+"iné.<br>JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte cyklické "
 "závislosti.</html>"
 
@@ -2929,11 +2937,11 @@
 #: ../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 ""
 "Chystáte sa zmazať body mimo Vami stiahnutú oblasť.<br>Toto môže spôsobiť "
-"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body."
-"<br>Naozaj ich chcete zmazať?"
+"problém iným objektom (nevidíte ich), ktoré môžu používať tieto "
+"body.<br>Naozaj ich chcete zmazať?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451
@@ -2986,5 +2994,6 @@
 msgid ""
 "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
+msgstr ""
+"Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69
@@ -3221,9 +3230,9 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
-"<br> and creating a new default preference file.</html>"
-msgstr ""
-"<html>Súbor preferencií mal chyby.<br> Vytváranie zo zálohy staršieho "
-"súboru  <br>{0}<br> a vytváranie nového východzieho súboru.</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 ""
+"<html>Súbor preferencií mal chyby.<br> Vytváranie zo zálohy staršieho súboru "
+" <br>{0}<br> a vytváranie nového východzieho súboru.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
@@ -3315,5 +3324,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3322,5 +3331,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3358,5 +3367,6 @@
 msgid ""
 "Unable to add primitive {0} to the dataset because it's already included"
-msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
+msgstr ""
+"Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623
@@ -3398,5 +3408,5 @@
 
 #. should not happen
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254
 #, java-format
@@ -3552,5 +3562,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 "Nemôžem porovnať pôvodné s ID ''{0}'' s pôvodným s ID ''{1}''."
 
@@ -3703,5 +3714,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"
@@ -3712,5 +3723,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"
@@ -3722,5 +3733,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"
@@ -3857,5 +3868,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 "<html>Nemôžem čítať záložky z<br>''{0}''<br>Chyba bola: {1}</html>"
 
@@ -3871,5 +3883,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}]"
@@ -4162,5 +4174,6 @@
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
+msgstr ""
+"Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
@@ -4348,6 +4361,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z <strong>"
-"{1} relácií</strong>.</html>"
+"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z "
+"<strong>{1} relácií</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
@@ -4395,5 +4408,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"
@@ -4402,5 +4415,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"
@@ -4409,5 +4422,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"
@@ -4617,5 +4630,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 ""
 "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy"
@@ -4689,6 +4703,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
-"html>"
+"<html>Click <strong>{0}</strong> to start merging my and their "
+"entries.</html>"
 msgstr ""
 "<html>Klik <strong>{0}</strong>pre začiatok spojovania mojich a ich "
@@ -4698,9 +4712,9 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
-"html>"
-msgstr ""
-"<html>Klik <strong>{0}</strong>pre koniec spojovania mojich a ich položiek</"
-"html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Klik <strong>{0}</strong>pre koniec spojovania mojich a ich "
+"položiek</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
@@ -4750,5 +4764,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70
 msgid "Merged nodes not frozen yet. Can't build resolution command."
-msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
+msgstr ""
+"Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
 
 #. should not happen
@@ -4761,6 +4776,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 ""
 "<html>Nastala chyba počas komunikácie so serverom<br>Detaily: {0}</html>"
@@ -4796,7 +4811,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 ""
 "<html>Sú tam {0} ďalšie pôvodné odkazy na reláciu {1}<br>ktoré sú zmazané na "
@@ -4914,6 +4929,6 @@
 msgstr ""
 "<html>Držať sa vašej lokálnej verzie, JOSM<br>má resetnúť id pôvodných {0} "
-"na 0.<br>Pri ďalšom nahrávaní serveru bude priraďovať <br>toto je nové id."
-"<br>Súhlasíte?</html>"
+"na 0.<br>Pri ďalšom nahrávaní serveru bude priraďovať <br>toto je nové "
+"id.<br>Súhlasíte?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
@@ -4935,6 +4950,6 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM odstráni vaše lokálne pôvodné s id {0}<br>z dátovej sady."
-"<br>Súhlasíte?</html>"
+"<html>JOSM odstráni vaše lokálne pôvodné s id {0}<br>z dátovej "
+"sady.<br>Súhlasíte?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
@@ -5259,5 +5274,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5269,6 +5285,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Vložte hodnotu značky, i.e. <strong><tt>kontrola členov</tt></strong></"
-"html>"
+"<html>Vložte hodnotu značky, i.e. <strong><tt>kontrola "
+"členov</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5315,6 +5331,6 @@
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
-"<html>Prisím vyberte ktoré hodnoty ponechať pre nasledujúce značky(tags).</"
-"html>"
+"<html>Prisím vyberte ktoré hodnoty ponechať pre nasledujúce "
+"značky(tags).</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47
@@ -5330,5 +5346,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 msgid "Open a list of all commands (undo buffer)."
-msgstr "Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))"
+msgstr ""
+"Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -5402,15 +5419,17 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
@@ -5893,5 +5912,6 @@
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr ""
+"Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
@@ -5911,6 +5931,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 ""
 "<html>Je tam aspoň jeden člen odkazujúci na túto reláciu<br>na vlastnú "
@@ -5931,10 +5951,10 @@
 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 ""
 "<html>Táto relácia už má jedného alebo viac členov odkazujúcich "
-"na<br>pôvodné ''{0}''<br><br>Skutočne chcete pridať ďalšieho relačného člena?"
-"</html>"
+"na<br>pôvodné ''{0}''<br><br>Skutočne chcete pridať ďalšieho relačného "
+"člena?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
@@ -5982,5 +6002,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801
 msgid "Remove all members referring to one of the selected primitives"
-msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
+msgstr ""
+"Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
 
 #. putValue(NAME, tr("Remove Selected"));
@@ -6071,6 +6092,6 @@
 msgstr ""
 "<html>Táto relácia bola zmenená zvonku z editoru.<br>Nemôžete použiť zmeny "
-"pokračovať v editácii.<br><br>Chcete vyriešiť konflikt a zavrieť editor?</"
-"html>"
+"pokračovať v editácii.<br><br>Chcete vyriešiť konflikt a zavrieť "
+"editor?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -6081,6 +6102,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 ""
 "<html>Vrstva ''{0}'' už mala konflikt pre pôvodné<br>''{1}''.<br>Prosím "
@@ -6131,6 +6153,6 @@
 msgstr ""
 "<html>Nastavujete prázdnu funkciu na {0} pôvodných.<br>Toto sa rovná "
-"vymazaniu funkcie z týchto pôvodných.<br>Skutočne chcete použiť novú funkciu?"
-"</html>"
+"vymazaniu funkcie z týchto pôvodných.<br>Skutočne chcete použiť novú "
+"funkciu?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237
@@ -6151,5 +6173,5 @@
 
 #. download the relation
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427
 #, java-format
@@ -6190,5 +6212,6 @@
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr ""
+"Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -6232,5 +6255,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 ""
 "Varovanie: ignorovanie výnimky pretože úloha bola zrušená. Výnimka bola: "
@@ -6419,10 +6443,11 @@
 #, 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>"
-msgstr ""
-"<html>Žiadny <strong>{0}</strong> ani <strong>{1}</strong> je umožnený."
-"<br>Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, alebo oba.</"
-"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 ""
+"<html>Žiadny <strong>{0}</strong> ani <strong>{1}</strong> je "
+"umožnený.<br>Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, "
+"alebo oba.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
@@ -7194,5 +7219,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
@@ -7432,6 +7457,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 ""
 
@@ -7441,6 +7466,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 ""
 
@@ -7582,5 +7607,6 @@
 "Failed to set current primitive. Current version {0} not available in "
 "history."
-msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
+msgstr ""
+"chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
@@ -7700,6 +7726,6 @@
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
-"<html>Verzia <strong>{0}</strong> aktuálne upravovaná vo vrstve ''{1}''</"
-"html>"
+"<html>Verzia <strong>{0}</strong> aktuálne upravovaná vo vrstve "
+"''{1}''</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
@@ -7821,5 +7847,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 "Vrstva ''{0}'' obsahuje zmeny ktoré, by mali byť nahraté na server."
 
@@ -7913,18 +7940,18 @@
 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] ""
-"<html>{0} vrstvy sa musia uložiť, pretože nemajú pričlenené súbory."
-"<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte zmeny.<br>Vrstvy "
-"bez súborov:</html>"
+"<html>{0} vrstvy sa musia uložiť, pretože nemajú pričlenené "
+"súbory.<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte "
+"zmeny.<br>Vrstvy bez súborov:</html>"
 msgstr[1] ""
 "<html>{0} vrstva sa musí uložiť, pretože nemá  pričlenený súbor.<br>Najskôr "
-"vyberte súbor pre túto vrstvu, alebo zrušte zmeny.<br>Vrstva bez súboru:</"
-"html>"
+"vyberte súbor pre túto vrstvu, alebo zrušte zmeny.<br>Vrstva bez "
+"súboru:</html>"
 msgstr[2] ""
-"<html>{0} vrstiev sa musí uložiť, pretože nemajú pričlenené súbory."
-"<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte zmeny.<br>Vrstvy "
-"bez súborov:</html>"
+"<html>{0} vrstiev sa musí uložiť, pretože nemajú pričlenené "
+"súbory.<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte "
+"zmeny.<br>Vrstvy bez súborov:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
@@ -7936,6 +7963,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 "
@@ -7985,5 +8012,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
-msgstr "Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené"
+msgstr ""
+"Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
@@ -7993,5 +8021,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
-msgstr "Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené."
+msgstr ""
+"Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
@@ -8148,5 +8177,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
+msgstr ""
+"Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
@@ -8226,5 +8256,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
 #, java-format
@@ -8339,5 +8369,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)"
@@ -8375,5 +8405,5 @@
 msgstr "Zadaný čas nemôže byť rozparsovaný"
 
-#: ../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
@@ -8381,30 +8411,30 @@
 msgstr "gps poloha bodu"
 
-#: ../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 "Prispôsobiť kresliacu trasu"
 
-#: ../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 "Použíť globálne nastavenie."
 
-#: ../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 "Kresliť spojnice medzi bodmi v tejto vrstve"
 
-#: ../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 "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
-#: ../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ýber nastavenia kreslenej čiary"
 
-#: ../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
@@ -8412,5 +8442,5 @@
 msgstr "Prispôsobiť farbu"
 
-#: ../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
@@ -8419,5 +8449,5 @@
 msgstr "Predvolené"
 
-#: ../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
@@ -8426,31 +8456,52 @@
 msgstr "Zvoľte farbu"
 
-#: ../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 "Značky z pomenovaných bodov"
 
-#: ../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 "Pomenovanie trackpoints od {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 "Importovať zvuk"
 
-#: ../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 Audiosúbory (*.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 "Zukové značky z {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 "Importovať obrázky"
 
-#: ../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
@@ -8458,5 +8509,5 @@
 msgstr "Meno: {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
@@ -8464,5 +8515,5 @@
 msgstr "Popis: {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"
@@ -8473,5 +8524,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
@@ -8479,22 +8530,22 @@
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../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 "Dĺžka: "
 
-#: ../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, "
@@ -8504,5 +8555,5 @@
 msgstr[2] "{0} trás, "
 
-#: ../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"
@@ -8512,23 +8563,23 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../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 "Konvertovať do dátovej vrstvy"
 
-#: ../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>Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.<br>K "
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../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
@@ -8539,29 +8590,29 @@
 msgstr "Prevedené z: {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 "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../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 "Stiahnuť všetko vo vnútry:"
 
-#: ../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} metrov"
 
-#: ../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 "Maximálna plocha na požiadavku:"
 
-#: ../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} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
 #, java-format
 msgid ""
@@ -8569,12 +8620,12 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí dát."
-"<br>Chcete pokračovať?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035
+"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí "
+"dát.<br>Chcete pokračovať?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
 
-#: ../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 "
@@ -8584,5 +8635,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../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 "
@@ -8702,6 +8753,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 ""
 "<html>Nahrať z nerozdelených GPS dát ako mapových dát je nepremyslene "
@@ -8835,5 +8886,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
-msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
+msgstr ""
+"Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
@@ -9262,5 +9314,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 ""
 "Nakreslite smerové šípky použijúc vyhľadávajúcu tabuľku namiesto "
@@ -9327,5 +9380,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 ""
 "Aplikovať vyhladzovanie (antialiasing) v mape pre jemnejšie zobrazenie."
@@ -9339,5 +9393,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
+msgstr ""
+"Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
 
 #. background layers in inactive color
@@ -9665,6 +9720,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 ""
 "<html>Neúspešné načítanie obsahu zdrojov štýlov z<br>''{0}''.<br><br>Detaily "
@@ -9732,6 +9787,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>Okrem toho, skratky sú aktivované, keď sú prvýkrát priradené k tlačítku v "
@@ -9748,8 +9803,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>Ako ste si mohli všimnúť, že výber kláves ktorý ponúka ďalšia strana sa "
@@ -9788,6 +9844,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>Pseudo-modifikátor 'vypnutý' vypnúť skratku pri konflikte.</p>"
 
@@ -10095,5 +10151,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 ""
 "žiadne pôvodné s id {0} v lokálnej dátovej sade. Nemôžem dedukovať typ "
@@ -10418,11 +10475,11 @@
 #: ../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>"
-msgstr ""
-"<html>Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení."
-"<br>Heslo je  prenesené v jednoduchom texte na server, kódované v URL."
-"<br><b>Nepoužite vzácne Heslo.</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 ""
+"<html>Varovanie: Heslo je uložené v jednoduchom texte v súbore "
+"nastavení.<br>Heslo je  prenesené v jednoduchom texte na server, kódované v "
+"URL.<br><b>Nepoužite vzácne Heslo.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
@@ -10450,9 +10507,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr ""
-"<html>Nejaká chyba nastala počas obnovy záložného súboru.<br>Chyba je: <br>"
-"{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error "
+"is:<br>{0}</html>"
+msgstr ""
+"<html>Nejaká chyba nastala počas obnovy záložného súboru.<br>Chyba je: "
+"<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113
@@ -10528,9 +10585,9 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"Chýbajúce povinné vlastnosti pri prvku ''hranice''. 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 ""
+"Chýbajúce povinné vlastnosti pri prvku ''hranice''. Got "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
@@ -10561,5 +10618,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 ""
 "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
@@ -10803,6 +10861,6 @@
 msgstr ""
 "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
-"požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať."
-"Ignorujem rozdielne nahrávanie."
+"požadujú použiť rozdielne nahratie , ale API nie je schopného "
+"ovládať.Ignorujem rozdielne nahrávanie."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
@@ -10868,5 +10926,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 ""
 "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej potrebný."
@@ -10876,6 +10935,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 ""
 "<html>Počet {0} pluginov bolo požadovaných.<br>Tento plugin nie je naďalej "
@@ -11106,6 +11165,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 ""
 
@@ -11130,7 +11189,7 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>Neúspešná inicializácia komunikácie s OSM serverom {0}."
-"<br>Skontrojujte URL servera vo vašich nastaveniach a vo vašom internetovom "
-"pripojení.</html>"
+"<html>Neúspešná inicializácia komunikácie s OSM serverom "
+"{0}.<br>Skontrojujte URL servera vo vašich nastaveniach a vo vašom "
+"internetovom pripojení.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
@@ -11149,10 +11208,10 @@
 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>Aktualizácia na server <strong>neuspešná</strong> pretože vaša "
-"aktuálna<br>dátová sada nespĺňa predpoklad.<br>Chybová správa je:<br>{0}</"
-"html>"
+"aktuálna<br>dátová sada nespĺňa predpoklad.<br>Chybová správa "
+"je:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
@@ -11214,6 +11273,7 @@
 "check your internet connection.</html>"
 msgstr ""
-"<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
-"<br>Prosím, skontrolujte vaše internetové pripojenie.</html>"
+"<html>Neúspešné otváranie a pripájanie na  vzdialený "
+"server<br>''{0}''.<br>Prosím, skontrolujte vaše internetové "
+"pripojenie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
@@ -11229,6 +11289,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 ""
 "<html>OSM server<br>''{0}''<br>hlási vnútornú chybu serveru.<br>Toto je "
@@ -11242,7 +11303,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 ""
 "Plocha, ktorú sa snažíte nahrať je príliš veľká, alebo vaša požiadavka bola "
@@ -11275,7 +11336,8 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
-"<br>Meno hostiteľa ''{1}'' nemôže byť vyriešený. <br>Prosím skontrolujte API "
-"URL vo vašich nastaveniach a vaše internetové pripojenie.</html>"
+"<html>Neúspešné otváranie a pripájanie na  vzdialený "
+"server<br>''{0}''.<br>Meno hostiteľa ''{1}'' nemôže byť vyriešený. "
+"<br>Prosím skontrolujte API URL vo vašich nastaveniach a vaše internetové "
+"pripojenie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
@@ -11284,26 +11346,24 @@
 "<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 ""
 "<html>Server hlási, že objekt je zmazaný.<br><strong>Nahrávanie je "
 "neúspešné</strong> Ak ste sa snažili nahrať, alebo vymazať tento objekt.<br> "
-"<strong>Nahrávanie neúspešné</strong> ak ste sa snažili nahrať tento objekt."
-"<br><br>Chybová správa je:<br>{0}</html>"
+"<strong>Nahrávanie neúspešné</strong> ak ste sa snažili nahrať tento "
+"objekt.<br><br>Chybová správa je:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-#, fuzzy
 msgid "Loading available locales..."
-msgstr "Vyhľadávanie dostupných prekladov..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-#, fuzzy
 msgid "Checking locales..."
-msgstr "kontrolujem cache..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, fuzzy, java-format
+#, java-format
 msgid "Checking translation for locale ''{0}''"
-msgstr "Vytvoriť novú reláciu vo vrstve \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
@@ -11672,5 +11732,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
-msgstr "Prosím vložte platné číslo pre spustenie a ukončenie doplnenia adries"
+msgstr ""
+"Prosím vložte platné číslo pre spustenie a ukončenie doplnenia adries"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
@@ -11822,11 +11883,11 @@
 #: ../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>"
-msgstr ""
-"<html>Urobte fotku Vášho GPS zariadenia keď ukazuje čas.<br>Zobrazte fotku."
-"<br>Potom len zapíšte čas ktorý vidíte na fotke a vyberte časovú zónu. <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>Urobte fotku Vášho GPS zariadenia keď ukazuje čas.<br>Zobrazte "
+"fotku.<br>Potom len zapíšte čas ktorý vidíte na fotke a vyberte časovú zónu. "
+"<hr></html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242
@@ -11892,5 +11953,6 @@
 
 #: ../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>"
+msgid ""
+"<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 msgstr ""
 "<html>Môžem použiť obrázok z môjho GPS prímača.<br>Môže toto pomôcť?</html>"
@@ -12202,14 +12264,17 @@
 #: ../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."
-msgstr ""
-"Špeciálny manipulant pre francúzsky kataster wms at www.cadastre.gouv."
-"fr<BR><BR>Prosím čítajte Podmienky pre využívanie (francúzsky): <br><a href="
-"\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> "
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
+msgstr ""
+"Špeciálny manipulant pre francúzsky kataster wms at "
+"www.cadastre.gouv.fr<BR><BR>Prosím čítajte Podmienky pre využívanie "
+"(francúzsky): <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>predtým, ako nahráte nejaké dáta vytvorené  týmto pluginom."
@@ -12221,5 +12286,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr "<html>Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý</html>"
+msgstr ""
+"<html>Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
@@ -12438,6 +12504,6 @@
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
-"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej polohy"
-"(georeferencing)"
+"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej "
+"polohy(georeferencing)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
@@ -13031,5 +13097,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:187
 msgid "Running vertex reduction..."
@@ -13091,7 +13157,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -13101,5 +13167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -13109,5 +13175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="drain"/>
@@ -13116,5 +13182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -13124,5 +13190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -13200,5 +13266,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 ""
 "Maximálny počet úsekov v každej vygenerovanej ceste. Východzia hodnota 250."
@@ -13222,10 +13289,11 @@
 #: ../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."
-msgstr ""
-"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v stupňoch."
-"<br>Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. Štandardne "
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
 "0.0003."
+msgstr ""
+"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v "
+"stupňoch.<br>Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. "
+"Štandardne 0.0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
@@ -13526,5 +13594,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 ""
 "Hlavička obsahuje niekoľko hodnôt a nemôže byť namapovaný jednotlivý reťazec"
@@ -14573,5 +14642,6 @@
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr "Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz."
+msgstr ""
+"Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
@@ -14583,5 +14653,6 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
+msgstr ""
+"Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
@@ -14697,10 +14768,11 @@
 #: ../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."
-msgstr ""
-"Zdroje (URL alebo názov súboru) z predstavených kontrol (pozrite http://wiki."
-"openstreetmap.org/index.php/User:JLS/speller) alebo súbory na kontrolu "
-"značiek."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
+msgstr ""
+"Zdroje (URL alebo názov súboru) z predstavených kontrol (pozrite "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) alebo súbory na "
+"kontrolu značiek."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
@@ -14844,5 +14916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -14850,5 +14922,5 @@
 #. <linemod mode="under" width="10" colour="#808000"/>
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -14858,5 +14930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -14865,5 +14937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -14872,5 +14944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -14879,5 +14951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -14886,5 +14958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -14893,9 +14965,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building" b="yes"/>
@@ -14940,5 +15012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -14992,5 +15064,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
-msgstr "Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty."
+msgstr ""
+"Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
@@ -15101,6 +15174,6 @@
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
 msgstr ""
-"<html>Nenachádza sa tam žiadna cesta spojená s bodom ''{0}''. Prerušujem.</"
-"html>"
+"<html>Nenachádza sa tam žiadna cesta spojená s bodom ''{0}''. "
+"Prerušujem.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
@@ -15226,5 +15299,6 @@
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
 "settings."
-msgstr "Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie."
+msgstr ""
+"Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
@@ -15277,6 +15351,6 @@
 "<html>Základ URL<br>''{0}''<br>pre túto WMS vrstvu neobsahuje na konci "
 "žiadnu z ''&'' ani s ''?''.<br>Toto pravdepodobne vedie k chybnej WMS "
-"požiadavke. Mali by ste skontrolovať vaše<br>nastavenie preferencií."
-"<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
+"požiadavke. Mali by ste skontrolovať vaše<br>nastavenie "
+"preferencií.<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
@@ -15413,5 +15487,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 ""
@@ -15483,6 +15557,6 @@
 "medzi nimi. Iba zmena farieb a vytvoriť novú schému. Použiť prepínač na "
 "biele pozadie so zodpovedajúcimi farbami pre lepšiu viditeľnosť pri jasnom "
-"slnečnom svetle. Pozrieť dialóg v JOSM nastaveniach a 'Map Settings"
-"(nastavenia mapy' (divné, ale pravdivé :-)"
+"slnečnom svetle. Pozrieť dialóg v JOSM nastaveniach a 'Map "
+"Settings(nastavenia mapy' (divné, ale pravdivé :-)"
 
 #. Plugin Create_grid_of_ways
@@ -15495,5 +15569,6 @@
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
-msgstr "Vytvorenie a správa adresných bodov a budov vrámci  Českej Republiky."
+msgstr ""
+"Vytvorenie a správa adresných bodov a budov vrámci  Českej Republiky."
 
 #. Plugin dataimport
@@ -15527,5 +15602,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 "Sťahuje GPS body z Globalsat DG100 datalogger-a  priamo do JOSM."
 
@@ -16781,8 +16857,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"/>
@@ -16979,5 +17055,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -16987,5 +17063,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -17004,5 +17080,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -17012,5 +17088,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -17029,5 +17105,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -17037,5 +17113,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -17054,5 +17130,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -17062,5 +17138,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -17075,5 +17151,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -17091,5 +17167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -17107,5 +17183,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -17114,5 +17190,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -17122,5 +17198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -17140,5 +17216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -17147,5 +17223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -17155,5 +17231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -17203,7 +17279,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -17870,5 +17946,6 @@
 #: build/trans_presets.java:892
 msgid "Bus Trap"
-msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
+msgstr ""
+"Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
 
 #. item "Barriers/Bus Trap"
@@ -17907,5 +17984,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:932
@@ -17944,5 +18021,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:954
@@ -18030,5 +18107,6 @@
 #: build/trans_presets.java:1043
 msgid "Sally Port"
-msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
+msgstr ""
+"Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
 
 #. item "Barriers/Sally Port"
@@ -18040,5 +18118,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -18195,5 +18273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -19581,5 +19659,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -19589,5 +19667,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -19597,5 +19675,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -19605,5 +19683,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -19961,7 +20039,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -19971,5 +20049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -19979,5 +20057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -19987,5 +20065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -19995,5 +20073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -20003,5 +20081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -20011,5 +20089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -20019,5 +20097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -20027,5 +20105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -20035,5 +20113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -20043,5 +20121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -20051,5 +20129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -20059,5 +20137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -20067,5 +20145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -20075,5 +20153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -20083,5 +20161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -20091,5 +20169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -20099,5 +20177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -20107,5 +20185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -20115,5 +20193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -20123,5 +20201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -20131,5 +20209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -20139,5 +20217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -20147,5 +20225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -20155,5 +20233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -20163,5 +20241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -20171,5 +20249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -20179,5 +20257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -20187,5 +20265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -20195,5 +20273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -20203,5 +20281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -20211,5 +20289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -20219,5 +20297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -20227,5 +20305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -20235,5 +20313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -20243,5 +20321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -20251,5 +20329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -20259,5 +20337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -20267,5 +20345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -20275,5 +20353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -20283,5 +20361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -20291,5 +20369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -20299,5 +20377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -20307,5 +20385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -20315,5 +20393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -20323,5 +20401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -20331,5 +20409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -22027,7 +22105,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -22037,5 +22115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -22045,5 +22123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -22053,5 +22131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -22061,5 +22139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -22069,5 +22147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -22077,5 +22155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -22085,5 +22163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -23415,5 +23493,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -23429,5 +23507,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -23438,7 +23516,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -23448,5 +23526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -23456,5 +23534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -23464,5 +23542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -23472,5 +23550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -23503,5 +23581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -23517,5 +23595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -23525,5 +23603,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -23533,5 +23611,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -23542,5 +23620,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -23569,5 +23647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -23682,9 +23760,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
@@ -23692,5 +23770,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,
@@ -23700,8 +23778,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
@@ -23715,5 +23793,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -23721,5 +23799,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -23768,6 +23846,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>
@@ -23847,5 +23925,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -23855,5 +23933,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -23862,5 +23940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -23870,5 +23948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -23877,5 +23955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -23884,5 +23962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -23891,5 +23969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -23898,5 +23976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -23905,5 +23983,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -23912,5 +23990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="gate"/>
@@ -23919,5 +23997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cattle_grid"/>
@@ -23926,5 +24004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="toll_booth"/>
@@ -23933,5 +24011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -23940,5 +24018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -23947,5 +24025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="viaduct"/>
@@ -23955,5 +24033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="viaduct"/>
@@ -23962,5 +24040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <!-- deprecated; use information=guidepost instead -->
@@ -23971,5 +24049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="marsh"/>
@@ -23981,11 +24059,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -23994,7 +24072,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--"deprecated" tags -->
-#.
+#. 
 #. <!-- historic=museum -> tourism=museum -->
 #. <rule>
@@ -24005,5 +24083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_wind -> power=generator and power_source=wind -->
 #. <rule>
@@ -24014,5 +24092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_hydro -> power=generator and power_source=hydro -->
 #. <rule>
@@ -24023,5 +24101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_fossil -> power=generator and power_source=fossil -->
 #. <rule>
@@ -24032,5 +24110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
 #. <rule>
@@ -24041,5 +24119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway classification now more detailed -->
 #. <rule>
@@ -24050,5 +24128,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- amenity=park_bench -> amenity=bench -->
 #. <rule>
@@ -24060,5 +24138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway=stile -> barrier=stile -->
 #. <rule>
@@ -24069,5 +24147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
 #. <rule>
@@ -24092,5 +24170,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -24099,5 +24177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -24106,5 +24184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -24120,5 +24198,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -24132,5 +24210,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -24139,5 +24217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -24146,5 +24224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -24153,5 +24231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -24160,5 +24238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -24167,5 +24245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -24174,5 +24252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -24181,5 +24259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -24188,5 +24266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -24195,5 +24273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -24202,5 +24280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -24209,5 +24287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -24216,5 +24294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -24223,5 +24301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -24230,5 +24308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24399,7 +24477,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -24413,5 +24491,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -24421,7 +24499,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -24431,5 +24509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -24439,5 +24517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -24447,5 +24525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -24455,5 +24533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -24469,5 +24547,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24477,5 +24555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24485,5 +24563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24493,5 +24571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24501,5 +24579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24509,5 +24587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24517,5 +24595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24534,5 +24612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -24541,5 +24619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -24553,5 +24631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -24565,5 +24643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -24572,5 +24650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -24584,5 +24662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -24597,5 +24675,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -24610,5 +24688,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -24622,5 +24700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -24634,5 +24712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -24641,5 +24719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -24648,5 +24726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
@@ -24660,5 +24738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -24668,5 +24746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -24675,5 +24753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -24682,5 +24760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -24689,5 +24767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -24697,5 +24775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -24706,5 +24784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -24714,7 +24792,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -24724,5 +24802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -24732,5 +24810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -24740,5 +24818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -24749,5 +24827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -24757,5 +24835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -24765,5 +24843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -24773,5 +24851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -24781,5 +24859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -24789,5 +24867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -24797,5 +24875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -24805,5 +24883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -24813,5 +24891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -24834,7 +24912,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -24844,5 +24922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -24851,5 +24929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -24859,5 +24937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -24866,5 +24944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -24874,5 +24952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -24882,5 +24960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -24896,5 +24974,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -24905,5 +24983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -24922,5 +25000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -24930,5 +25008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24941,5 +25019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24957,5 +25035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -24964,5 +25042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -24971,5 +25049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -24978,7 +25056,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -24989,5 +25067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -25002,5 +25080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -25014,5 +25092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -25022,5 +25100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -25034,5 +25112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -25046,5 +25124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -25053,7 +25131,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -25063,5 +25141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -25071,5 +25149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -25079,5 +25157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -25087,5 +25165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -25101,7 +25179,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -25116,5 +25194,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -25129,5 +25207,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -25142,5 +25220,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -25155,5 +25233,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -25168,5 +25246,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -25181,7 +25259,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -25191,5 +25269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -25198,5 +25276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -25206,5 +25284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -25214,5 +25292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -25222,5 +25300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -25230,5 +25308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -25238,5 +25316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -25246,5 +25324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -25254,5 +25332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -25262,5 +25340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -25270,5 +25348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -25278,5 +25356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -25286,5 +25364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -25304,5 +25382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -25317,5 +25395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -25328,7 +25406,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -25338,5 +25416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -25346,5 +25424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -25354,5 +25432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -25362,5 +25440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -25370,5 +25448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -25378,5 +25456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -25386,5 +25464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -25394,5 +25472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -25402,5 +25480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -25410,5 +25488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -25418,5 +25496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -25426,5 +25504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -25434,5 +25512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -25442,5 +25520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -25461,5 +25539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -25473,7 +25551,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -25483,5 +25561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -25491,5 +25569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -25499,5 +25577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -25507,5 +25585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -25515,5 +25593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -25523,5 +25601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -25531,5 +25609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -25546,5 +25624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -25554,5 +25632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -25562,5 +25640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -25570,5 +25648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -25578,5 +25656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -25586,5 +25664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -25594,5 +25672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -25602,5 +25680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -25610,5 +25688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -25618,5 +25696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -25626,5 +25704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -25634,5 +25712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -25651,5 +25729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -25659,5 +25737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -25666,5 +25744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -25674,5 +25752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -25682,5 +25760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -25690,5 +25768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -25697,5 +25775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -25705,5 +25783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -25713,5 +25791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -25721,5 +25799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -25729,5 +25807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -25736,5 +25814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -25743,5 +25821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -25750,5 +25828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -25757,5 +25835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -25764,5 +25842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -25771,5 +25849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -25778,5 +25856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -25785,5 +25863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -25792,5 +25870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -25799,5 +25877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -25806,5 +25884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -25813,5 +25891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -25820,5 +25898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -25828,5 +25906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -25836,5 +25914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -25844,5 +25922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -25852,5 +25930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -25860,5 +25938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -25868,5 +25946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -25876,5 +25954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -25884,5 +25962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -25892,5 +25970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -25901,5 +25979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -25909,5 +25987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -25917,5 +25995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -25925,5 +26003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -25933,5 +26011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -25941,5 +26019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -25949,5 +26027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -25957,5 +26035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -25965,5 +26043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -25973,5 +26051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -25981,5 +26059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -25989,5 +26067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -25997,5 +26075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -26005,5 +26083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -26013,5 +26091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -26021,5 +26099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -26029,5 +26107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -26037,5 +26115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -26045,5 +26123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -26052,5 +26130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -26082,5 +26160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -26090,5 +26168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -26098,7 +26176,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -26113,5 +26191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -26121,5 +26199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -26129,5 +26207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -26137,5 +26215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -26145,5 +26223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -26153,5 +26231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -26161,5 +26239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -26175,7 +26253,7 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -26185,5 +26263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -26193,5 +26271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -26201,5 +26279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -26209,5 +26287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -26217,5 +26295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -26225,5 +26303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -26233,5 +26311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -26241,5 +26319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -26249,5 +26327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -26257,5 +26335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -26265,5 +26343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -26273,5 +26351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -26281,5 +26359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -26289,5 +26367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -26297,5 +26375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -26305,5 +26383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -26313,5 +26391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -26321,5 +26399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -26329,5 +26407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -26337,5 +26415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -26345,5 +26423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -26353,5 +26431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -26361,5 +26439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -26369,5 +26447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -26377,5 +26455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -26385,5 +26463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -26393,5 +26471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -26401,5 +26479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -26409,5 +26487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -26417,5 +26495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -26425,5 +26503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -26433,5 +26511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -26441,5 +26519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -26449,5 +26527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -26457,5 +26535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -26465,5 +26543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -26473,5 +26551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -26481,5 +26559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -26489,5 +26567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -26497,5 +26575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -26505,5 +26583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -26513,5 +26591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -26547,7 +26625,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -26557,5 +26635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -26565,5 +26643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -26573,5 +26651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -26581,5 +26659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -26589,5 +26667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -26597,5 +26675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -26605,5 +26683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -26620,5 +26698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -26628,5 +26706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -26636,5 +26714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -26644,5 +26722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -26652,5 +26730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -26660,5 +26738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -26669,5 +26747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -26677,5 +26755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -26685,5 +26763,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -26693,5 +26771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -26700,5 +26778,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -26707,5 +26785,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -26723,7 +26801,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -26733,5 +26811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -26741,5 +26819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -26749,5 +26827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -26757,5 +26835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -26765,5 +26843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -26773,5 +26851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -26781,5 +26859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -26789,5 +26867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -26797,5 +26875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -26814,5 +26892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -26826,5 +26904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -26838,5 +26916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -26846,5 +26924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -26858,5 +26936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
@@ -26870,5 +26948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -26882,6 +26960,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -26891,5 +26969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -26903,5 +26981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -26915,5 +26993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -26927,5 +27005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -26939,5 +27017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -26951,5 +27029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -26959,7 +27037,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -26969,5 +27047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -26977,5 +27055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -26985,5 +27063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -26993,5 +27071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -27008,5 +27086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -27019,5 +27097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -27031,5 +27109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -27043,5 +27121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -27055,5 +27133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -27064,5 +27142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -27072,5 +27150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -27080,5 +27158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -27088,5 +27166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -27096,5 +27174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -27111,5 +27189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -27123,5 +27201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -27135,5 +27213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -27147,5 +27225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -27159,5 +27237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -27171,5 +27249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -27178,7 +27256,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -27188,5 +27266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -27196,5 +27274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -27204,5 +27282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -27212,5 +27290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -27220,5 +27298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -27228,5 +27306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -27236,5 +27314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
@@ -27251,7 +27329,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -27261,5 +27339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -27269,5 +27347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -27277,5 +27355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -27285,5 +27363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
@@ -27299,5 +27377,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?
@@ -27323,5 +27401,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -27332,11 +27410,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -27346,5 +27424,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -27354,5 +27432,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -27362,5 +27440,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -27370,5 +27448,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -27378,5 +27456,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -27386,5 +27464,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -27394,5 +27472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -27402,5 +27480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -27410,5 +27488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -27418,5 +27496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -27426,5 +27504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -27434,5 +27512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -27452,5 +27530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -27459,5 +27537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -27466,5 +27544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -27473,5 +27551,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -27480,5 +27558,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -27487,5 +27565,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -27580,5 +27658,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -27586,28 +27664,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
@@ -27722,5 +27800,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -27733,5 +27811,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>
@@ -27756,6 +27834,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -27764,6 +27842,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -27778,6 +27856,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
@@ -27791,6 +27869,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
@@ -27810,6 +27888,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -27833,6 +27911,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
@@ -27845,71 +27923,58 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "Could not create a node with the entered latitude/longitude."
-#~ msgstr "Nemôžem vytvoriť body so vstupnými súradnicami šírka/dĺžka."
-
-#~ msgid "Illegal lat/lon value"
-#~ msgstr "Neplatná širka/dĺžka hodnota"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Prosíme napíšte chybovú správu v {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Opíšte (detailne) kroky, ktoré vedú k chybe."
+#~ msgid "Move"
+#~ msgstr "Presunúť"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Prosím najskôr zadajte požadované koordináty."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Vyriešiť konflikty"
+
+#~ msgid "my version:"
+#~ msgstr "moja verzia:"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Neznáma verzia"
+
+#~ msgid "Change"
+#~ msgstr "Zmeniť"
+
+#~ msgid "unnamed"
+#~ msgstr "nepomenované"
+
+#~ msgid "No data imported."
+#~ msgstr "Neboli importované žiadne dáta."
+
+#, java-format
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Chyba pri načítaní stránky {0}"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Neuložené zmeny"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before reporting "
+#~ "a bug."
 #~ msgstr ""
 #~ "Skúste aktualizovať na najnovšiu verziu tohoto doplnku (pluginu) pred "
 #~ "hlásením chyby."
 
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Prosím pripojte nasledujúcu informáciu:"
-
-#~ msgid "Move"
-#~ msgstr "Presunúť"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Prosím najskôr zadajte požadované koordináty."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Vyriešiť konflikty"
-
-#~ msgid "my version:"
-#~ msgstr "moja verzia:"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Neznáma verzia"
-
-#~ msgid "Change"
-#~ msgstr "Zmeniť"
-
-#~ msgid "unnamed"
-#~ msgstr "nepomenované"
-
-#~ msgid "No data imported."
-#~ msgstr "Neboli importované žiadne dáta."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Chyba pri načítaní stránky {0}"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neuložené zmeny"
-
 #~ msgid "Found <nd> element in non-way."
 #~ msgstr "Nájdený element <nd> mimo cesty."
 
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Vynecháva sa cesta pretože obsahuje body ktoré neexistujú: {0}\n"
@@ -27919,6 +27984,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste "
-#~ "zmenšiť oblasť."
+#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste zmenšiť "
+#~ "oblasť."
 
 #~ msgid "<nd> has zero ref"
@@ -27935,7 +28000,9 @@
 #~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo  posun"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Použiť prednastavenie \"{0}\""
@@ -27966,10 +28033,11 @@
 
 #~ 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 ""
 #~ "Vrátiť stav všetkých vybratých objektov na verziu vybratú zo zoznamu "
 #~ "histórie."
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Vrstvy: {0}"
@@ -27979,6 +28047,6 @@
 
 #~ 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 ""
 #~ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu."
@@ -27991,6 +28059,5 @@
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi."
+#~ msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi."
 
 #~ msgid "Only one node selected"
@@ -28013,4 +28080,5 @@
 #~ msgstr "Súbor nebol nájdený"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Nemôžem otvoríť adresár s nastavením: {0}"
@@ -28022,4 +28090,5 @@
 #~ msgstr "Prihlasovacie meno (email) k OSM účtu."
 
+#, java-format
 #~ msgid "Error deleting plugin file: {0}"
 #~ msgstr "Chyba pri mazaní súboru pluginu: {0}"
@@ -28028,4 +28097,5 @@
 #~ msgstr "Plugin už existuje"
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Nemôžem stiahnuť plugin: {0} z {1}"
@@ -28034,4 +28104,5 @@
 #~ msgstr "Spojenie konfliktov"
 
+#, java-format
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Konflikty: {0}"
@@ -28043,4 +28114,5 @@
 #~ msgstr "Obnoviť obsah výberu."
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -28067,4 +28139,5 @@
 #~ msgstr "Zobraziť Stav Dlaždíc"
 
+#, java-format
 #~ msgid "requested: {0}"
 #~ msgstr "požadovaný: {0}"
@@ -28115,4 +28188,14 @@
 #~ msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu."
 
+#, java-format
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Prosíme napíšte chybovú správu v {0}"
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr "Opíšte (detailne) kroky, ktoré vedú k chybe."
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Prosím pripojte nasledujúcu informáciu:"
+
 #~ msgid "Found <member> element in non-relation."
 #~ msgstr "Nájdený <member> element mimo relácie."
@@ -28168,10 +28251,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>Upozornenie: Heslo je uložené v nešifrovanej podobe v konfiguračnom "
-#~ "súbore.<br>Heslo sa prenáša v nešifrovanej podobe v URL na server."
-#~ "<br><b>Nepoužívajte dôležité heslo.</b></html>"
+#~ "súbore.<br>Heslo sa prenáša v nešifrovanej podobe v URL na "
+#~ "server.<br><b>Nepoužívajte dôležité heslo.</b></html>"
 
 #~ msgid "Rotate"
@@ -28184,4 +28267,5 @@
 #~ msgstr "rôzne"
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch."
@@ -28208,4 +28292,5 @@
 #~ msgstr "pozícia (miesto)"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -28237,4 +28322,5 @@
 #~ "a začnite v novej vrstve a v novej zóne."
 
+#, java-format
 #~ msgid "Delete {1} {0}"
 #~ msgstr "Zmazať {1} {0}"
@@ -28274,10 +28360,11 @@
 #~ msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "prekresľovač id={0}"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -28294,6 +28381,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"
@@ -28302,6 +28389,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS "
-#~ "plugin - zmeny sa prejavia aj vo WMS menu.\n"
+#~ "Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS plugin -"
+#~ " zmeny sa prejavia aj vo WMS menu.\n"
 #~ "\n"
 #~ "Môžete zmeny urobiť aj ručne v hlavnom nastavení, použite nasledujúci "
@@ -28315,6 +28402,6 @@
 #~ "format=image/jpeg\n"
 #~ "\n"
-#~ "Pre Metacarta's Map Rectifier(prekresľovač http://labs.metacarta.com/"
-#~ "rectifier/ , potrebujete iba príslušný 'id'.\n"
+#~ "Pre Metacarta's Map Rectifier(prekresľovač "
+#~ "http://labs.metacarta.com/rectifier/ , potrebujete iba príslušný 'id'.\n"
 #~ "Pridať  Metacarta Map Rectifier položku v menu, ručne vytvoriť  URL ako v "
 #~ "tomto príklade,nahradiť 73 s vašim id obrázka:\n"
@@ -28322,13 +28409,12 @@
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak "
-#~ "máte pochybnosť, nepoužite ho."
-
+#~ "Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak máte "
+#~ "pochybnosť, nepoužite ho."
+
+#, 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 ""
-#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky "
-#~ "stiahnuť."
+#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky stiahnuť."
 
 #~ msgid "Portcullis"
@@ -28350,4 +28436,5 @@
 #~ msgstr "Zobraziť panel autorov(spracovateľov)"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autori(spracovatelia): {0}"
@@ -28373,4 +28460,5 @@
 #~ "the config option 'pluginmanager.warntime'.)"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -28396,6 +28484,6 @@
 #~ msgstr "Vybrať Tableau d'Assemblage"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}"
@@ -28407,4 +28495,5 @@
 #~ msgstr "Odstrániť označené"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}."
@@ -28431,4 +28520,5 @@
 #~ msgstr "Posunúť dole"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor relácie: {0}"
@@ -28444,11 +28534,13 @@
 #~ "nahraté elementy majú zaznamenaný priebeh(history)."
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete "
-#~ "si pokračovať?"
-
+#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete si "
+#~ "pokračovať?"
+
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Najskôr zmente projekciu na {0}."
@@ -28458,6 +28550,6 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You can "
+#~ "adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Stala sa nejaká chyba, pri skúške či sa hodia fotky ku GPX stope. Môžete "
@@ -28489,10 +28581,10 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to selected "
+#~ "user, opens browser showing selected author profile page."
 #~ msgstr ""
-#~ "Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré "
-#~ "patria vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou "
-#~ "stránkou profilu autora."
+#~ "Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré patria "
+#~ "vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou stránkou "
+#~ "profilu autora."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -28501,14 +28593,15 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
+#~ "eg. deleting uninteresting parts of track."
 #~ msgstr ""
-#~ "Hlavná vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). "
-#~ "Tento plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM "
-#~ "eg. vymazaním nezaujímavých častí stopy (track)"
+#~ "Hlavná vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). Tento "
+#~ "plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM eg. "
+#~ "vymazaním nezaujímavých častí stopy (track)"
 
 #~ msgid "Remove route nodes"
 #~ msgstr "Odstrániť trasové body"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -28533,6 +28626,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want to "
+#~ "combine them?"
 #~ msgstr ""
 #~ "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?"
@@ -28551,6 +28644,6 @@
 
 #~ 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 ""
 #~ "Zvolené body majú rozdielne vzťahové(relation) členy. Napriek tomu ich "
@@ -28564,6 +28657,5 @@
 
 #~ 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 ""
 #~ "Žiadne údaje pre uloženie sú nenájdené. Máte otvorenú, alebo načítanú "
@@ -28576,4 +28668,5 @@
 #~ msgstr "V priebehu sťahovania nastala nasledujúca chyba :"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -28616,13 +28709,15 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme "
-#~ "vývojárov JOSM."
+#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme vývojárov "
+#~ "JOSM."
 
 #~ msgid "Open a layer first (GPX, OSM, cache)"
 #~ msgstr "Najprv vytvorte nejakú vrstvu (GPX, OSM, cache)"
 
+#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "Neočakávaný \"type\" člena {0} relácie  {1} (hodnota {2})"
 
+#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať."
@@ -28631,4 +28726,5 @@
 #~ msgstr "% lon:"
 
+#, java-format
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
@@ -28655,4 +28751,5 @@
 #~ msgstr "Nahrávanie na OSM API neúspešné"
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
@@ -28664,4 +28761,5 @@
 #~ msgstr "Obnovovanie cesty..."
 
+#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrolujem či sú závislosti {0} is gone ..."
@@ -28670,22 +28768,22 @@
 #~ msgstr "Aktualizácia neúspešná"
 
+#, 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 pôvodné s id <strong>{0}</strong> bolo vymazané<br>na servery "
-#~ "iným mapérom.<br><br>Click <strong>{1}</strong> pomechať vaše pôvodné a "
-#~ "ignorovať vymazaný stav.<br>Vašemu pôvodnému bode priradené nové id."
-#~ "<br>Click <strong>{2}</strong> prijať stav na servery a vymazať váš "
-#~ "pôvodný stav.<br>Click <strong>{3}</strong> zrušiť.<br>"
-
+#~ "<html>OSM pôvodné s id <strong>{0}</strong> bolo vymazané<br>na servery iným "
+#~ "mapérom.<br><br>Click <strong>{1}</strong> pomechať vaše pôvodné a ignorovať "
+#~ "vymazaný stav.<br>Vašemu pôvodnému bode priradené nové id.<br>Click "
+#~ "<strong>{2}</strong> prijať stav na servery a vymazať váš pôvodný "
+#~ "stav.<br>Click <strong>{3}</strong> zrušiť.<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>Sú tam <strong>{0}</strong> pôvodné <br>vybrané pre individuálnu "
@@ -28701,4 +28799,5 @@
 #~ msgstr "Chýbajúce pôvodné"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -28707,6 +28806,6 @@
 #~ msgstr ""
 #~ "<html>Aktualizácia <strong>neúspešná</strong> pretože pôvodné sa "
-#~ "snaží<br>zmazať na servery už zmazané.<br><br>Chybová správa je:<br>{0}</"
-#~ "html>"
+#~ "snaží<br>zmazať na servery už zmazané.<br><br>Chybová správa "
+#~ "je:<br>{0}</html>"
 
 #~ msgid "Conflict detected"
@@ -28738,6 +28837,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 "
@@ -28753,6 +28852,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"
@@ -28764,6 +28863,6 @@
 #~ "toto sa potom zobrazí vo WMS menu.\n"
 #~ "\n"
-#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite "
-#~ "nasledujúcu schému:\n"
+#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite nasledujúcu "
+#~ "schému:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -28774,8 +28873,8 @@
 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
 #~ "\n"
-#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ ,"
-#~ "potrebujete iba aktuálne vstupné 'id'.\n"
-#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL "
-#~ "ako v tomto príklade, položenie 73 vášho obrázka id:\n"
+#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ "
+#~ ",potrebujete iba aktuálne vstupné 'id'.\n"
+#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL ako "
+#~ "v tomto príklade, položenie 73 vášho obrázka 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"
@@ -28784,8 +28883,9 @@
 #~ "máte pochybnosti, nepoužite ich."
 
+#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
-
+#~ msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
+
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -28801,7 +28901,9 @@
 #~ msgstr "API inicializácia neúspešná"
 
+#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "vybranie odkazu z cesty {0}"
 
+#, java-format
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr "<html>Chybný priebeh nahrávania zo servera. Detaily:<br>{0}</html>"
@@ -28813,4 +28915,5 @@
 #~ msgstr "WGS84 Geographisch"
 
+#, java-format
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Vrstva {0} musí byť v zozname vrstiev"
@@ -28822,4 +28925,5 @@
 #~ msgstr "Roztriediť vybrané relačné členy, alebo celý zoznam"
 
+#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Členy: {0} (spojenie: {1})"
@@ -28837,7 +28941,9 @@
 #~ msgstr "Pridať nový XML zdroj do zoznamu."
 
+#, java-format
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Odstrániť člena relácie {0} {1}"
 
+#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov."
@@ -28855,10 +28961,10 @@
 #~ msgstr "Konflikt je vytvorený"
 
+#, java-format
 #~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
+#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
+#~ msgstr ""
+#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka bola: "
 #~ "{0}"
-#~ msgstr ""
-#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka "
-#~ "bola: {0}"
 
 #~ msgid "Linked"
@@ -28877,17 +28983,20 @@
 #~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
 #~ msgstr ""
-#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main."
-#~ "getCurrentDataSet()"
-
+#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s "
+#~ "Main.getCurrentDataSet()"
+
+#, java-format
 #~ msgid ""
 #~ "Failed to access system property ''{0}'' for security reasons. Exception "
 #~ "was: {1}"
 #~ msgstr ""
-#~ "Neúspešný  prístup k systémovej vlastnosti ''{0}'' z bezpečnostného "
-#~ "dôvodu. Výnimka bola: {1}"
-
+#~ "Neúspešný  prístup k systémovej vlastnosti ''{0}'' z bezpečnostného dôvodu. "
+#~ "Výnimka bola: {1}"
+
+#, java-format
 #~ msgid "Unknown file extension for file ''{0}''"
 #~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''"
 
+#, java-format
 #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
 #~ msgstr ""
@@ -28897,4 +29006,5 @@
 #~ msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta."
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
@@ -28909,20 +29019,24 @@
 #~ "Výnimka: {0}"
 
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
 #~ msgstr ""
-#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. "
-#~ "Výnimka: {0}"
-
+#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. Výnimka: "
+#~ "{0}"
+
+#, java-format
 #~ msgid ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
-#~ "was: {0}"
+#~ "Warning: failed to put ''please wait dialog'' always on top. Exception was: "
+#~ "{0}"
 #~ msgstr ""
 #~ "Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. "
 #~ "Výnimky boli: {0}"
 
+#, java-format
 #~ msgid "Do you really want to delete layer ''{0}''?"
 #~ msgstr "Naozaj chcete vymazať vrstvu ''{0}''?"
 
+#, java-format
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Vymazávaná vrstva {0} z {1}"
@@ -28931,10 +29045,12 @@
 #~ msgstr "Zmazať všetko"
 
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
 #~ msgstr ""
-#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na "
-#~ "vrchu. Výnimka bola: {0}"
-
+#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na vrchu. "
+#~ "Výnimka bola: {0}"
+
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
@@ -28943,4 +29059,5 @@
 #~ "Výnimka bola: {0}"
 
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to put history browser always on top. Exception was: {0}"
@@ -28949,11 +29066,13 @@
 #~ "bola: {0}"
 
+#, java-format
 #~ msgid ""
 #~ "Failed to close changeset {0}, will be closed by server after timeout. "
 #~ "Exception was: {1}"
 #~ msgstr ""
-#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového "
-#~ "limitu servera. Výnimka bola: {1}"
-
+#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového limitu "
+#~ "servera. Výnimka bola: {1}"
+
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -28965,17 +29084,17 @@
 #~ "Vo vrstve sa nachádza neuložená {0} zmena. Nepoužiť zmenu a pokračovať?"
 #~ msgstr[2] ""
-#~ "Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a "
-#~ "pokračovať?"
-
+#~ "Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a pokračovať?"
+
+#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</"
-#~ "html>"
-
+#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</html>"
+
+#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
+#~ "from relation?</html>"
 #~ msgstr ""
 #~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.<br>Zmazať z "
@@ -28989,10 +29108,11 @@
 
 #~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
+#~ "Select to upload the data using a new changeset and to leave the changeset "
+#~ "open after the upload"
 #~ msgstr ""
 #~ "Vybrať pre nahratie používaných dát nový súbor zmien a nechať súbor zmien "
 #~ "otvorený aj po nahratí"
 
+#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
@@ -29002,7 +29122,9 @@
 #~ "otvorený pre ďalšie nahratia"
 
+#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr "Použite existujúci súbor zmien {0} a zavrite ho po nahratí"
 
+#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to close the changeset "
@@ -29012,16 +29134,18 @@
 #~ "tomto nahratí"
 
+#, java-format
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
+#~ "changeset will automatically be closed by the server after a timeout.</html>"
 #~ msgstr ""
-#~ "<html>Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery ''{1}''."
-#~ "<br>The súbor zmien bude automaticky zavretý na servery po vypršaní "
+#~ "<html>Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery "
+#~ "''{1}''.<br>The súbor zmien bude automaticky zavretý na servery po vypršaní "
 #~ "časového limitu.</html>"
 
+#, java-format
 #~ msgid "Changeset {0} is unchanged. Skipping update."
 #~ msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu."
@@ -29030,10 +29154,11 @@
 #~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..."
 
+#, java-format
 #~ msgid "Reusing existing changeset {0}"
 #~ msgstr "Znovu použitý existujúci súbor zmien {0}"
 
 #~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a "
-#~ "new one."
+#~ "Warning: could not reuse an existing changeset as requested. Opening a new "
+#~ "one."
 #~ msgstr ""
 #~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol "
@@ -29041,9 +29166,9 @@
 
 #~ msgid ""
-#~ "Failed to update changeset. Either there is no current changeset or the "
-#~ "id of the current changeset is 0"
+#~ "Failed to update changeset. Either there is no current changeset or the id "
+#~ "of the current changeset is 0"
 #~ msgstr ""
-#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor "
-#~ "zmien, alebo id aktuálneho súboru zmien je 0"
+#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor zmien, "
+#~ "alebo id aktuálneho súboru zmien je 0"
 
 #~ msgid "not yet decided"
@@ -29053,7 +29178,9 @@
 #~ msgstr "Nastavenie(Set) "
 
+#, java-format
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "parameter''{0}'' nesmie byť nula"
 
+#, java-format
 #~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
 #~ msgstr "nepodporovaná hodnota ''{0}'' alebo parameter ''{1}''"
@@ -29065,52 +29192,64 @@
 #~ msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty"
 
+#, java-format
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "Chýba povinný atribút ''{0}''"
 
+#, java-format
 #~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, "
-#~ "API version is ''0.5''. Got {1}"
+#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+#~ "version is ''0.5''. Got {1}"
 #~ msgstr ""
-#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, "
-#~ "API verziu je ''0.5''. Got {1}"
-
+#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, API "
+#~ "verziu je ''0.5''. Got {1}"
+
+#, java-format
 #~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, "
-#~ "API version is ''0.5''. Got {1}"
+#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
+#~ "version is ''0.5''. Got {1}"
 #~ msgstr ""
 #~ "VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 1, "
 #~ "API verzia je ''0.5''. Got {1}"
 
+#, java-format
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''"
 
+#, java-format
 #~ msgid "Processing {0}"
 #~ msgstr "Spracovávanie {0}"
 
+#, java-format
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "Relácia: z {0} do {1} sprostredkujúca(via) {2}"
 
+#, java-format
 #~ msgid "{0} extrem nodes."
 #~ msgstr "{0} hraničné(extrem) body."
 
+#, java-format
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "Sprostredkujúce(Via) body {0}, {1}"
 
+#, java-format
 #~ msgid "{0} via nodes."
 #~ msgstr "{0} Sprostredkujúce(via) body."
 
+#, java-format
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Stred(MIddle) cesty: {0}"
 
+#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
 #~ "Chýbajúca stránka s pomocou. Vytvorte to v <A HREF=\"{0}\">English</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 ""
-#~ "Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">English</A> "
-#~ "or <A HREF=\"{1}\">váš jazyk</A>."
+#~ "Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">English</A> or "
+#~ "<A HREF=\"{1}\">váš jazyk</A>."
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
@@ -29122,10 +29261,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 ""
-#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A> "
-#~ "alebo <A HREF=\"{1}\">váš jazyk</A>."
-
+#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A> alebo "
+#~ "<A HREF=\"{1}\">váš jazyk</A>."
+
+#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "neočakávaná hodnota. Dostal {0}"
@@ -29143,4 +29283,5 @@
 #~ msgstr "nenájdená staršia verzia. História je prázdna."
 
+#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "index je mimo hranice Dostať {0}"
@@ -29149,4 +29290,5 @@
 #~ msgstr "Zobraziť priebeh z vybraných pôvodných"
 
+#, java-format
 #~ msgid ""
 #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
@@ -29154,18 +29296,20 @@
 #~ "nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''"
 
+#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 #~ msgstr ""
 #~ "nedovolená hodnota pre povinný atribút ''{0}''  typu int (>=0), dostáva "
 #~ "''{1}''"
 
+#, java-format
 #~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
+#~ "default geometry. Details: {1}"
 #~ msgstr ""
 #~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
 #~ "východziu geometriu. Detaily: {1}"
 
+#, java-format
 #~ msgid ""
 #~ "The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
@@ -29199,2 +29343,8 @@
 #~ msgid "null detected in node list"
 #~ msgstr "prázdny zoznam bodov"
+
+#~ msgid "Could not create a node with the entered latitude/longitude."
+#~ msgstr "Nemôžem vytvoriť body so vstupnými súradnicami šírka/dĺžka."
+
+#~ msgid "Illegal lat/lon value"
+#~ msgstr "Neplatná širka/dĺžka hodnota"
