Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 21721)
+++ applications/editors/josm/i18n/po/sl.po	(revision 21971)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 17:35+0200\n"
-"PO-Revision-Date: 2010-06-09 19:30+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 17:57+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
-"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:19+0000\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -24,5 +24,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:478
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
@@ -94,5 +94,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
-#: ../plugins/reverter/src/reverter/ReverterUploadHook.java:78
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -274,6 +274,8 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -282,4 +284,6 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -317,6 +321,6 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
 msgstr ""
 
@@ -340,9 +344,9 @@
 #. Add extra shortcut C-S-a
 #. Add extra shortcut ESCAPE
-#. 
+#.
 #. * FIXME: this isn't optimal. In a better world the mapmode actions
 #. * would be able to capture keyboard events and react accordingly. But
 #. * for now this is a reasonable approximation.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -402,4 +406,5 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -439,5 +444,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
 msgid "Information"
 msgstr "Informacije"
@@ -645,5 +650,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1012
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
@@ -658,5 +663,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96
 msgid "Delete"
 msgstr "Izbriši"
@@ -905,4 +910,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
@@ -913,4 +919,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
 msgid "This can lead to nodes being deleted accidentally."
 msgstr ""
@@ -1460,6 +1467,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
@@ -1486,4 +1493,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:83
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:91
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
@@ -1492,6 +1501,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
 msgid "Error"
 msgstr "Napaka"
@@ -1603,6 +1612,5 @@
 
 #: ../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 ""
 "Prikaži poročilo o stanju s podatki, ki so lahko koristni pri prijavi napak"
@@ -1639,8 +1647,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:69
 msgid "Yes, delete nodes"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:69
 msgid "Delete nodes outside of downloaded data regions"
 msgstr ""
@@ -1649,5 +1659,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "No, abort"
 msgstr ""
@@ -1655,16 +1666,21 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:73
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:119
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
 msgid "Cancel operation"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
 msgid "Do you want to delete them anyway?"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:88
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:75
 msgid "Delete nodes outside of data regions?"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 msgid "Please select at least one way to simplify."
 msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
@@ -1673,13 +1689,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 msgid "Yes"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:113
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 msgid "Simplify all selected ways"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1688,8 +1707,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 msgid "Simplify ways?"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:180
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:137
 #, java-format
 msgid "Simplify {0} way"
@@ -1699,4 +1720,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:251
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:265
 #, java-format
 msgid "Simplify Way (remove {0} node)"
@@ -1832,6 +1854,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid ""
-"* One node that is used by more than one way and one of those ways, or"
+msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali"
 
@@ -1897,9 +1918,9 @@
 
 #. Add extra shortcut ESCAPE
-#. 
+#.
 #. * FIXME: this isn't optimal. In a better world the mapmode actions
 #. * would be able to capture keyboard events and react accordingly. But
 #. * for now this is a reasonable approximation.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
@@ -1916,5 +1937,5 @@
 
 #. bounds defined? => use the bbox downloader
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
@@ -1978,5 +1999,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:99
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:116
-#: ../plugins/reverter/src/reverter/ReverterUploadHook.java:77
 msgid "No changes to upload."
 msgstr "Ni sprememb za pošiljanje."
@@ -1994,14 +2014,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:256
 msgid "Checking parents for deleted objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:316
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:315
 #, java-format
 msgid "Reading parents of ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:322
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:321
 msgid "Checking for deleted parents in the local dataset"
 msgstr ""
@@ -2256,5 +2276,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2371,6 +2391,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 ""
 
@@ -2500,5 +2520,5 @@
 
 #. -- prepare the combo box with the search expressions
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
@@ -2614,6 +2634,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
-"nodes:min-max)"
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
 msgstr ""
 
@@ -2875,10 +2895,14 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -3000,5 +3024,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:208
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84
 #, java-format
@@ -3076,7 +3100,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
 msgstr ""
 
@@ -3122,11 +3146,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:119
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3135,5 +3159,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3142,5 +3166,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:168
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -3346,6 +3370,6 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
 msgstr ""
 
@@ -3428,5 +3452,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3435,5 +3459,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3442,5 +3466,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3487,4 +3511,7 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:121
 #, java-format
 msgid "Missing merge target for way with id {0}"
@@ -3496,29 +3523,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:201
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
 msgid "Missing merge target for node with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
 #, java-format
 msgid "Missing merge target for relation with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:221
-#: ../plugins/reverter/src/reverter/DataSetToCmd.java:69
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
-
-#. should not happen
-#. FIXME: this message does not make sense, source version can not be lower than
-#. target version at this point
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:258
-#, java-format
-msgid ""
-"Target object with id {0} and version {1} is visible although source object "
-"with lower version {2} is not visible. Cannot deal with this inconsistency. "
-"Keeping target object. "
 msgstr ""
 
@@ -3597,19 +3618,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:506
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:573
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:575
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3618,5 +3639,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1167
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3624,5 +3645,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3684,6 +3705,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid ""
-"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3698,5 +3718,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
 msgid "selected"
 msgstr "izbrano"
@@ -3860,6 +3880,5 @@
 #: ../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 ""
 
@@ -3932,5 +3951,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3940,5 +3959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3947,5 +3966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3954,5 +3973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3961,5 +3980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3968,5 +3987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -3975,9 +3994,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -3986,5 +4005,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4292
+#: build/trans_style.java:4325
 msgid "building"
 msgstr "zgradba"
@@ -4073,5 +4092,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:477
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
@@ -4291,5 +4310,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4298,4 +4317,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219
@@ -4495,5 +4515,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:563
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4532,6 +4552,6 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
-"too.</html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"html>"
 msgstr ""
 
@@ -4562,5 +4582,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"
@@ -4569,5 +4589,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"
@@ -4576,5 +4596,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"
@@ -4788,6 +4808,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4867,6 +4886,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 ""
 
@@ -4874,6 +4893,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4924,6 +4943,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 ""
 
@@ -5140,10 +5159,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:211
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:538
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:444
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
 msgid "Key"
@@ -5152,10 +5173,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:538
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:444
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5237,4 +5260,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227
 msgid "none"
 msgstr "brez"
@@ -5451,7 +5475,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
 msgid ""
-"<html>Select to show changesets for the currently selected objects "
-"only.<br>Unselect to show all changesets for objects in the current data "
-"layer.</html>"
+"<html>Select to show changesets for the currently selected objects only."
+"<br>Unselect to show all changesets for objects in the current data layer.</"
+"html>"
 msgstr ""
 
@@ -5476,6 +5500,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid ""
-"Download information about the selected changesets from the OSM server"
+msgid "Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5521,5 +5544,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:530
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5592,10 +5615,9 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this "
-"conflict.<br>Conflict resolutions will not be applied unless all "
-"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
-"anyway.<strong> Already<br>resolved differences will not be "
-"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
-"conflicts.</html>"
+"<html>You did not finish to merge the differences in this conflict."
+"<br>Conflict resolutions will not be applied unless all differences<br>are "
+"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
+"Already<br>resolved differences will not be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
 
@@ -5618,5 +5640,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5624,5 +5646,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
 msgid "Add"
 msgstr "Dodaj"
@@ -5671,5 +5693,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../plugins/reverter/src/reverter/ReverterPlugin.java:21
+#: ../plugins/reverter/src/reverter/ReverterPlugin.java:18
 msgid "History"
 msgstr "Zgodovina"
@@ -5889,10 +5911,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1098
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select relation in relation list."
 msgstr ""
@@ -7347,6 +7369,6 @@
 #, java-format
 msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"Please enter a date in the usual format for your locale.<br>Example: {0}"
+"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
 
@@ -7370,8 +7392,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126
 msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"<html>Please select one the following <strong>standard queries</strong>."
+"Select <strong>Download my changesets only</strong> if you only want to "
+"download changesets created by yourself.<br>Note that JOSM will download "
+"max. 100 changesets.</html>"
 msgstr ""
 
@@ -7491,9 +7513,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:164
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
 #, java-format
 msgid "This will change {0} object."
@@ -7502,23 +7524,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:198
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:288
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<različno>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
 msgid "Change values?"
 msgstr "Sprememba vrednosti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7529,5 +7551,5 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
 #, java-format
 msgid "This will change up to {0} object."
@@ -7538,77 +7560,77 @@
 msgstr[3] "Spremenili boste do {0} predmete."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
 msgid "Please select a key"
 msgstr "Izberite ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:383
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
 msgid "Please select a value"
 msgstr "Izberite vrednost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:482
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:530
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
 msgid "Properties/Memberships"
 msgstr "Lastnosti/Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
 msgid "Properties for selected objects."
 msgstr "Lastnosti izbranih predmetov"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:563
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:563
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:940
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:996
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:992
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:999
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naj res izbrišem izbor iz relacije {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1020
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1046
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1053
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1058
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1094
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1102
 msgid "Select relation in main selection."
 msgstr ""
@@ -7723,6 +7745,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 ""
 
@@ -7740,6 +7762,6 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
 msgstr ""
 
@@ -7894,7 +7916,6 @@
 #, 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 ""
 
@@ -8228,7 +8249,6 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
 
@@ -8369,6 +8389,6 @@
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information. You can both edit the <a href=\"{2}\">help topic in "
-"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
-"english</a>.</p></html>"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"a>.</p></html>"
 msgstr ""
 
@@ -8378,6 +8398,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 ""
 
@@ -8651,9 +8671,8 @@
 "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 ""
 
@@ -8668,8 +8687,7 @@
 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 ""
 
@@ -8915,5 +8933,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 msgid "No"
 msgstr ""
@@ -8921,6 +8939,5 @@
 #: ../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 ""
 
@@ -9005,6 +9022,6 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a "
-"file:</html>"
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -9018,6 +9035,6 @@
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
-"written.<br>Either select another file for this layer or discard the "
-"changes.<br>Layer with a non-writable file:</html>"
+"written.<br>Either select another file for this layer or discard the changes."
+"<br>Layer with a non-writable file:</html>"
 msgid_plural ""
 "<html>{0} layers need saving but have associated files<br>which cannot be "
@@ -9243,5 +9260,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9267,6 +9284,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid ""
-"The changeset is going to be <strong>closed</strong> after this upload"
+msgid "The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9321,6 +9337,6 @@
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple "
-"changesets</strong> using <strong>{1} requests</strong>"
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
 msgstr ""
 
@@ -9374,7 +9390,7 @@
 msgid ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
-"map editing.<br>"
+"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
+"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
+"editing.<br>"
 msgstr ""
 
@@ -9384,5 +9400,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9398,5 +9414,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426
 #, java-format
 msgid "Uploading {0} object..."
@@ -9407,6 +9423,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid ""
-"Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9624,7 +9639,7 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points do not include a timestamp we cannot "
-"correlate them with audio data.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
 msgstr ""
 
@@ -9650,7 +9665,7 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points do not include a timestamp we cannot "
-"correlate them with images.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
 msgstr ""
 
@@ -9714,6 +9729,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
 msgstr ""
 
@@ -9891,6 +9906,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
 msgstr ""
 
@@ -9956,7 +9971,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
+"<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 ""
 
@@ -10527,6 +10542,6 @@
 "<html>Run a fully automatic procedure to get an access token from the OSM "
 "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-"fully<br>automatically authorizes the user and retrieves an Access "
-"Token.</html>"
+"fully<br>automatically authorizes the user and retrieves an Access Token.</"
+"html>"
 msgstr ""
 
@@ -10548,8 +10563,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
 msgid ""
-"Please enter your OSM user name and password. The password will "
-"<strong>not</strong> be saved in clear text in the JOSM preferences and it "
-"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
-"data upload requests don't use your password any more."
+"Please enter your OSM user name and password. The password will <strong>not</"
+"strong> be saved in clear text in the JOSM preferences and it will be "
+"submitted to the OSM server <strong>only once</strong>. Subsequent data "
+"upload requests don't use your password any more."
 msgstr ""
 
@@ -10669,6 +10684,6 @@
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed. JOSM failed to log into {0}<br>for user "
-"{1}.<br><br>Please check username and password and try again.</html>"
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
 msgstr ""
 
@@ -10778,6 +10793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid ""
-"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -10911,8 +10925,8 @@
 "authorization page in an external browser. Please login with your OSM "
 "username and password and follow the instructions to authorize the Request "
-"Token. Then switch back to this dialog and click on "
-"<strong>{0}</strong><br><br>If launching the external browser fails you can "
-"copy the following authorize URL and paste it into the address field of your "
-"browser.</html>"
+"Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorize URL and paste it into the address field of your browser."
+"</html>"
 msgstr ""
 
@@ -10995,8 +11009,8 @@
 msgid ""
 "<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
-"test to retrieve the user details for this token failed, "
-"though.<br>Depending on what rights are granted to this token you may "
-"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
-"other protected resources.</html>"
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
 msgstr ""
 
@@ -11023,7 +11037,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
 msgid ""
-"<html>The test failed because the server responded with an internal "
-"error.<br>JOSM could not decide whether the token is valid. Please try again "
-"later.</html>"
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM could not decide whether the token is valid. Please try again later."
+"</html>"
 msgstr ""
 
@@ -11074,5 +11088,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:101
 msgid "Please select the row to delete."
 msgstr "Prosim izberite vrstico za izbris."
@@ -11427,6 +11441,5 @@
 #. drawGpsArrowsFast
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
-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 ""
 
@@ -11485,6 +11498,5 @@
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
-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 ""
 
@@ -11556,5 +11568,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr ""
@@ -11574,6 +11586,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid ""
-"The following plugin has been downloaded <strong>successfully</strong>:"
+msgid "The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11698,6 +11709,6 @@
 "a menu entry of a button for the first time. So some of your changes may "
 "become active even without restart --- but also without collision handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes "
-"here.</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes here."
+"</p>"
 msgstr ""
 
@@ -11710,9 +11721,9 @@
 "keyboard do not have them, Sun keyboards do), then do not use it. Also there "
 "are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. "
-"'':''/Colon). Please do not use them either, use the base key "
-"('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) "
-"instead. Not doing so may result in conflicts, as there is no way for JOSM "
-"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
-"keyboard.</p>"
+"'':''/Colon). Please do not use them either, use the base key ('';''/"
+"Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. "
+"Not doing so may result in conflicts, as there is no way for JOSM to know "
+"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard.</"
+"p>"
 msgstr ""
 
@@ -12009,6 +12020,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 ""
 
@@ -12019,5 +12030,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12027,18 +12038,18 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 #, java-format
 msgid ""
 "<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
-"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] "
-"{3}</table></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] {3}</"
+"table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #, java-format
 msgid ""
@@ -12047,5 +12058,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 #, java-format
 msgid ""
@@ -12054,5 +12065,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
 #, java-format
 msgid ""
@@ -12061,9 +12072,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Prednastavljene oznake"
@@ -12172,6 +12183,6 @@
 #, java-format
 msgid ""
-"<html>Failed to build URL ''{0}'' for validating the OSM API "
-"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12193,6 +12204,6 @@
 msgid ""
 "<html>Failed to retrieve a list of changesets from the OSM API server "
-"at<br>''{1}''. The server responded with the return code {0} instead of "
-"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12270,6 +12281,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12285,6 +12295,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid ""
-"You already have an Access Token to access the OSM server using OAuth."
+msgid "You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12378,6 +12387,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
 msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-"
-"Djava.net.useSystemProxies=true</tt> to enable)"
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
 msgstr ""
 
@@ -12512,4 +12521,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:111
 msgid "Change Properties"
 msgstr "Spremeni lastnosti"
@@ -12675,5 +12685,5 @@
 #. Just log something. The network stack will also throw an exception which will be caught
 #. somewhere else
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
@@ -12693,5 +12703,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -12858,6 +12868,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid ""
-"No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -12974,10 +12983,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:257
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -12985,69 +12994,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:386
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:662
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:663
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
 msgid "No changeset present for diff upload."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:538
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:539
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:635
 msgid "Current changeset is null. Cannot upload data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:637
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:664
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:665
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -13225,4 +13234,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:280
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -13242,6 +13252,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
 msgstr ""
 
@@ -13269,6 +13279,6 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
@@ -13310,6 +13320,5 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid ""
-"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13745,6 +13754,6 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
-"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
+"<br>You have to update JOSM in order to use this plugin.</html>"
 msgstr ""
 
@@ -13954,6 +13963,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:147
 #, java-format
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14020,5 +14028,5 @@
 
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
 msgid "Do nothing"
@@ -14101,6 +14109,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 
@@ -14108,7 +14116,7 @@
 #, java-format
 msgid ""
-"<html>Authentication at the OSM server with the username ''{0}'' "
-"failed.<br>Please check the username and the password in the JOSM "
-"preferences.</html>"
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
 msgstr ""
 
@@ -14116,7 +14124,7 @@
 #, java-format
 msgid ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
-"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
-"token.</html>"
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
 msgstr ""
 
@@ -14124,8 +14132,8 @@
 #, java-format
 msgid ""
-"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
-"failed.<br>The token is not authorised to access the protected "
-"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
-"another OAuth token.</html>"
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
 msgstr ""
 
@@ -14145,7 +14153,7 @@
 msgid ""
 "<html>Communication with the OSM server ''{0}''failed. The server "
-"replied<br>the following error code and the following error "
-"message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
-"(untranslated)</strong>: {2}</html>"
+"replied<br>the following error code and the following error message:"
+"<br><strong>Error code:<strong> {1}<br><strong>Error message (untranslated)</"
+"strong>: {2}</html>"
 msgstr ""
 
@@ -14214,7 +14222,6 @@
 #, 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 ""
 
@@ -14226,7 +14233,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:371
 msgid ""
-"The area you tried to download is too big or your request was too "
-"large.<br>Either request a smaller area or use an export file provided by "
-"the OSM community."
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
 msgstr ""
 
@@ -14258,6 +14265,6 @@
 "<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 ""
 
@@ -14757,6 +14764,6 @@
 "</span><span style=\"font-size: medium;\"><br>\n"
 "...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> "
-"Plugin...</span>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
+"span>\n"
 "</div>\n"
 "</html>"
@@ -14783,6 +14790,6 @@
 "<div style=\"font-family: sans-serif;\">\n"
 "<ul>\n"
-"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
-"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span style="
+"\"color:green\">Ctrl-click</span></i></b>ing\n"
 "on a segment. The other, to be aligned segment will become parallel to\n"
 "this one. </li>\n"
@@ -14820,6 +14827,6 @@
 "parallel with the reference segment, the to be aligned segment will rotate "
 "around this point. You can choose the two extremities or the centre of the "
-"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
-"\n"
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing "
+"nearby. \n"
 "  </li>\n"
 "</ul>\n"
@@ -14835,7 +14842,7 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span "
-"style=\"color:green\">Shift-A</span></i></b>. Alternatively you''ll find the "
-"command in the <b>Tools</b>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+"<b>Tools</b>\n"
 " menu or may want to place the action on the <b>toolbar</b>.\n"
 "  </li>\n"
@@ -14886,9 +14893,28 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Zgradbe"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+msgid "Rotate crosshair"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Napredne nastavitve"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Zgradba"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:156
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:257
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
@@ -14897,35 +14923,44 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#, fuzzy
+msgid "Auto-select building"
+msgstr "Javne zgradbe"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+msgid "Advanced..."
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
-msgid "Point on the corner of building to start drawing"
-msgstr ""
-
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
-msgid "Point on opposite end of building"
-msgstr ""
-
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+msgid "Point on the corner of the building to start drawing"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+msgid "Point on opposite end of the building"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+msgid "Set width of the building"
 msgstr ""
 
@@ -15100,7 +15135,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15110,5 +15145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15118,5 +15153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15132,5 +15167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15140,5 +15175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15146,8 +15181,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2358 build/trans_style.java:993
-#: build/trans_style.java:1010 build/trans_style.java:1026
-#: build/trans_style.java:1033 build/trans_style.java:3492
-#: build/trans_style.java:3500
+#: build/trans_presets.java:2358 build/trans_style.java:1018
+#: build/trans_style.java:1035 build/trans_style.java:1051
+#: build/trans_style.java:1058 build/trans_style.java:3525
+#: build/trans_style.java:3533
 msgid "water"
 msgstr ""
@@ -15169,5 +15204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15176,5 +15211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15183,5 +15218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15190,5 +15225,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15197,5 +15232,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15204,10 +15239,10 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
-#: build/trans_style.java:4320 build/trans_style.java:4327
-#: build/trans_style.java:4334 build/trans_style.java:4341
+#: build/trans_style.java:4353 build/trans_style.java:4360
+#: build/trans_style.java:4367 build/trans_style.java:4374
 msgid "address"
 msgstr ""
@@ -15236,11 +15271,10 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.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."
+"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 ""
 
@@ -15666,6 +15700,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Prazna plast"
@@ -15848,4 +15882,51 @@
 msgstr ""
 
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188
+msgid "Child script have returned invalid data."
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#, fuzzy
+msgid "Edit tool"
+msgstr "Uredi živalski vrt"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Naziv"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+msgid "CmdLine:"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26
+msgid "External tools"
+msgstr ""
+
+#. Plugin ext_tools
+#: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
+#: build/trans_plugins.java:24
+msgid "Use external scripts in JOSM"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:73
+#, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Ali ste prepričani?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Nova vloga"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Izposojevalnica"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16112,5 +16193,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16231,6 +16312,5 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16249,7 +16329,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 msgstr ""
 
@@ -16558,6 +16637,5 @@
 
 #: ../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 ""
 
@@ -16667,6 +16745,5 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid ""
-"You have unsaved changes in your queue. Do you want to submit them now?"
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16717,6 +16794,5 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid ""
-"Write position information into the exif header of the following files:"
+msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17080,5 +17156,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetReverter.java:316
+#: ../plugins/reverter/src/reverter/ChangesetReverter.java:302
 #, java-format
 msgid "Missing merge target for {0} with id {1}"
@@ -17128,4 +17204,41 @@
 #, java-format
 msgid "Revert changeset #{0}"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Nalaganje vstavkov"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
+msgid "Roadsign tagging"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
+msgid "Add tags by clicking on road signs"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:54
+msgid "Roadsigns plugin: open dialog"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:82
+#, fuzzy, java-format
+msgid "Could not read tagging preset source: ''{0}''"
+msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Različica {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, java-format
+msgid "Additional sign {0}"
 msgstr ""
 
@@ -17233,4 +17346,15 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#, fuzzy
+msgid "Simplify Area"
+msgstr "Poenostavi pot"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Izbriši nepotrebna vozlišča iz poti."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18022,6 +18146,6 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
 msgid ""
-"Development of the turn restriction plugin was sponsored by <a "
-"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
+"Development of the turn restriction plugin was sponsored by <a href=\"http://"
+"www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
 
@@ -18107,8 +18231,8 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM way <span class=\"object-"
-"name\">{0}</span> with role <tt>from</tt> <strong>and</strong> with role "
-"<tt>to</tt>. In a turn restriction, the way with role <tt>from</tt> should "
-"be different from the way with role <tt>to</tt>, though."
+"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
+"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
+"a turn restriction, the way with role <tt>from</tt> should be different from "
+"the way with role <tt>to</tt>, though."
 msgstr ""
 
@@ -18162,8 +18286,8 @@
 "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
 "<strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at "
-"node <span class=\"object-name\">{2}</span> but <span class=\"object-"
-"name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It is "
-"recommended to set <span class=\"object-name\">{2}</span> as unique "
-"<strong>via</strong>-object."
+"node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">"
+"{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to "
+"set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-"
+"object."
 msgstr ""
 
@@ -18275,6 +18399,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18282,6 +18406,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18930,7 +19054,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
 msgid ""
-"The sources (URL or filename) of spell check (see "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
-"data files."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
 
@@ -19126,9 +19249,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4299
+#: build/trans_style.java:4332
 msgid "area"
 msgstr ""
@@ -19224,11 +19347,144 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:86
-#, java-format
-msgid "{0} covers {1}% of GPS track"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:104
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#, java-format
+msgid "{0} {1}% of GPS track"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
+#, fuzzy
+msgid "Import Video"
+msgstr "Uvozi zvok"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
+msgid "Sync a video against this GPS track"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "Remove Video"
+msgstr "Odstrani"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Odstrani fotografijo iz plasti"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Predvajanje/Premor"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+msgid "starts/pauses video playback"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "backward"
+msgstr "ozadje"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Skok nazaj"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Naprej"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Skok naprej"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Hitreje"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+msgid "faster playback"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175
+#, fuzzy
+msgid "slower"
+msgstr "Počasneje"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175
+msgid "slower playback"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:102
+msgid "loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
+#, fuzzy
+msgid "loops n sec around current position"
+msgstr "Nenehno centriraj plast LiveGPS na trenutni položaj."
+
+#. now the options menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193
+msgid "Keep centered"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193
+msgid "follows the video icon automaticly"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:207
+msgid "Jump length"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+msgid "Set the length of a jump"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:207
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218
+msgid "Jump in video for x ms"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218
+msgid "Loop length"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214
+msgid "Set the length around a looppoint"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227
+msgid "no deinterlacing"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:235
+msgid "deinterlacing using line doubling"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgid "deinterlacing using linear interpolation"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "plast"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
+msgid "Unable to find JNA Java library!"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:135
+msgid "Unable to find native libvlc library!"
 msgstr ""
 
@@ -19441,28 +19697,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Samodejno sprejemanje"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:103
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:156
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:158
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19473,113 +19729,113 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:174
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Nastavitve WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Spremeni seznam strežnikov WMS, ki so prikazani v meniju WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79
 msgid "Menu Name"
 msgstr "Naziv v meniju"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:83
 msgid "WMS URL"
 msgstr "Povezava do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Vpišite ime za meni in povezavo do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr ""
@@ -19595,4 +19851,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19605,7 +19865,7 @@
 #. 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.
-#. 
+#.
 #. The tex before is for translators
-#. 
+#.
 #. OSM server message
 #: build/specialmessages.java:8
@@ -19653,8 +19913,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3261
 msgid "forest"
 msgstr ""
@@ -19671,7 +19931,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19681,5 +19941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19722,5 +19982,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19730,5 +19990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19738,5 +19998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19746,15 +20006,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:17 build/trans_style.java:3622
-#: build/trans_style.java:3630 build/trans_style.java:3634
-#: build/trans_style.java:3638 build/trans_style.java:3642
-#: build/trans_style.java:3646 build/trans_style.java:3650
-#: build/trans_style.java:3654 build/trans_style.java:3658
-#: build/trans_style.java:3662 build/trans_style.java:3666
-#: build/trans_style.java:3671 build/trans_style.java:3679
-#: build/trans_style.java:3687 build/trans_style.java:3695
+#: build/specialmessages.java:17 build/trans_style.java:3655
+#: build/trans_style.java:3663 build/trans_style.java:3667
+#: build/trans_style.java:3671 build/trans_style.java:3675
+#: build/trans_style.java:3679 build/trans_style.java:3683
+#: build/trans_style.java:3687 build/trans_style.java:3691
+#: build/trans_style.java:3695 build/trans_style.java:3699
+#: build/trans_style.java:3704 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
 msgid "boundary"
 msgstr ""
@@ -19770,5 +20030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19777,7 +20037,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19787,5 +20047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19795,5 +20055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19803,5 +20063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19811,5 +20071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19819,5 +20079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19827,5 +20087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19835,12 +20095,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:19 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612
+#: build/specialmessages.java:19 build/trans_style.java:3589
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645
 msgid "route"
 msgstr ""
@@ -20117,21 +20377,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:24
-msgid ""
-"Download GPS points from Globalsat dg100 data logger directly in JOSM."
+#: build/trans_plugins.java:26
+msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:32
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -20141,10 +20400,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:36
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -20152,5 +20411,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:38
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -20160,15 +20419,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:40
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:42
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20177,5 +20436,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:46
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -20185,15 +20444,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20201,5 +20460,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20207,5 +20466,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20214,5 +20473,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20221,10 +20480,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20232,15 +20491,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid "Plugin for reverting changesets"
 msgstr ""
 
+#. File ../plugins/roadsigns/build.xml had no data
 #. Plugin routes
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:69
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20249,10 +20509,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr ""
 
+#. Plugin SimplifyArea
+#: build/trans_plugins.java:73
+msgid ""
+"Simplify area by removing nodes on very obtuse angles. This can be "
+"constrained by maximum removed area size. Also average nearby nodes."
+msgstr ""
+
 #. Plugin slippymap
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:75
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20261,15 +20528,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:81
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20279,10 +20546,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20291,5 +20558,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:87
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20298,5 +20565,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20305,10 +20572,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:93
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20317,5 +20584,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:95
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20325,5 +20592,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20332,15 +20599,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:101
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:103
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20349,5 +20616,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21237,10 +21504,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- junction tag -->
-#. 
+#.
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:898
+#: build/trans_presets.java:372 build/trans_style.java:923
 msgid "roundabout"
 msgstr "krožišče"
@@ -21377,8 +21644,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"/>
@@ -21588,5 +21855,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21596,5 +21863,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21613,5 +21880,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21621,5 +21888,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21638,5 +21905,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21646,5 +21913,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21663,5 +21930,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21671,5 +21938,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21684,5 +21951,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21700,8 +21967,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3252
+#: build/trans_presets.java:411 build/trans_style.java:3285
 msgid "residential"
 msgstr ""
@@ -21716,5 +21983,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21723,5 +21990,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21731,10 +21998,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4357
+#: build/trans_style.java:4390
 msgid "service"
 msgstr ""
@@ -21749,5 +22016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21756,5 +22023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21764,10 +22031,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:880
-#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_style.java:3350 build/trans_style.java:3351
 msgid "construction"
 msgstr ""
@@ -22773,9 +23040,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3484
+#: build/trans_presets.java:1041 build/trans_style.java:3517
 msgid "marsh"
 msgstr ""
@@ -23105,5 +23372,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23113,5 +23380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23121,5 +23388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23129,5 +23396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23137,5 +23404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23145,5 +23412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23153,5 +23420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23162,5 +23429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23168,9 +23435,9 @@
 #: build/trans_presets.java:1188 build/trans_presets.java:1200
 #: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:756
-#: build/trans_style.java:1182 build/trans_style.java:1246
-#: build/trans_style.java:1254 build/trans_style.java:1263
-#: build/trans_style.java:1271 build/trans_style.java:1279
-#: build/trans_style.java:1280 build/trans_style.java:1287
+#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_style.java:1207 build/trans_style.java:1271
+#: build/trans_style.java:1279 build/trans_style.java:1288
+#: build/trans_style.java:1296 build/trans_style.java:1304
+#: build/trans_style.java:1305 build/trans_style.java:1312
 msgid "rail"
 msgstr ""
@@ -24580,5 +24847,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24588,5 +24855,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24596,5 +24863,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24604,5 +24871,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24966,7 +25233,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24976,5 +25243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24984,5 +25251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24992,5 +25259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25000,5 +25267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25008,5 +25275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25016,5 +25283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25024,5 +25291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25032,5 +25299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25040,5 +25307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25048,5 +25315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25056,5 +25323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25064,5 +25331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25072,5 +25339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25080,5 +25347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25088,5 +25355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25096,5 +25363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25104,5 +25371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25112,5 +25379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25120,5 +25387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25128,5 +25395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25136,5 +25403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25144,5 +25411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25152,5 +25419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25160,5 +25427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25168,5 +25435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25176,5 +25443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25184,5 +25451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25192,5 +25459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25200,5 +25467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25208,5 +25475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25216,5 +25483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25224,5 +25491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25232,5 +25499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25240,5 +25507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25248,5 +25515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25256,5 +25523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25264,5 +25531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25272,5 +25539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25280,5 +25547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25288,5 +25555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25296,5 +25563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25304,5 +25571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25312,5 +25579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25320,5 +25587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25328,5 +25595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25336,33 +25603,33 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="fishing"/>
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3705 build/trans_style.java:3713
-#: build/trans_style.java:3721 build/trans_style.java:3729
-#: build/trans_style.java:3737 build/trans_style.java:3745
-#: build/trans_style.java:3753 build/trans_style.java:3761
-#: build/trans_style.java:3769 build/trans_style.java:3777
-#: build/trans_style.java:3785 build/trans_style.java:3793
-#: build/trans_style.java:3801 build/trans_style.java:3809
-#: build/trans_style.java:3817 build/trans_style.java:3825
-#: build/trans_style.java:3833 build/trans_style.java:3841
-#: build/trans_style.java:3849 build/trans_style.java:3857
-#: build/trans_style.java:3865 build/trans_style.java:3873
-#: build/trans_style.java:3881 build/trans_style.java:3889
-#: build/trans_style.java:3897 build/trans_style.java:3905
-#: build/trans_style.java:3913 build/trans_style.java:3921
-#: build/trans_style.java:3929 build/trans_style.java:3937
-#: build/trans_style.java:3945 build/trans_style.java:3953
-#: build/trans_style.java:3961 build/trans_style.java:3969
-#: build/trans_style.java:3977 build/trans_style.java:3985
-#: build/trans_style.java:3993 build/trans_style.java:4001
-#: build/trans_style.java:4009 build/trans_style.java:4017
-#: build/trans_style.java:4025 build/trans_style.java:4033
-#: build/trans_style.java:4041 build/trans_style.java:4049
-#: build/trans_style.java:4057 build/trans_style.java:4065
-#: build/trans_style.java:4073
+#: build/trans_style.java:3738 build/trans_style.java:3746
+#: build/trans_style.java:3754 build/trans_style.java:3762
+#: build/trans_style.java:3770 build/trans_style.java:3778
+#: build/trans_style.java:3786 build/trans_style.java:3794
+#: build/trans_style.java:3802 build/trans_style.java:3810
+#: build/trans_style.java:3818 build/trans_style.java:3826
+#: build/trans_style.java:3834 build/trans_style.java:3842
+#: build/trans_style.java:3850 build/trans_style.java:3858
+#: build/trans_style.java:3866 build/trans_style.java:3874
+#: build/trans_style.java:3882 build/trans_style.java:3890
+#: build/trans_style.java:3898 build/trans_style.java:3906
+#: build/trans_style.java:3914 build/trans_style.java:3922
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "sport"
 msgstr "šport"
@@ -27040,7 +27307,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27050,5 +27317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27058,5 +27325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27066,5 +27333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27074,5 +27341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27082,5 +27349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27090,5 +27357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27098,5 +27365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27106,12 +27373,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2494 build/trans_style.java:3157
-#: build/trans_style.java:3165 build/trans_style.java:3173
-#: build/trans_style.java:3181 build/trans_style.java:3189
-#: build/trans_style.java:3236 build/trans_style.java:3244
-#: build/trans_style.java:3342 build/trans_style.java:3350
+#: build/trans_presets.java:2494 build/trans_style.java:3190
+#: build/trans_style.java:3198 build/trans_style.java:3206
+#: build/trans_style.java:3214 build/trans_style.java:3222
+#: build/trans_style.java:3269 build/trans_style.java:3277
+#: build/trans_style.java:3375 build/trans_style.java:3383
 msgid "green"
 msgstr ""
@@ -28527,5 +28794,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28541,5 +28808,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28549,18 +28816,35 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
-#. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
 #. <rule>
 #. <condition k="highway" v="path"/>
 #. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
 #. color foot
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
 #. <condition k="bicycle" v="designated"/>
 #. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
 #. color roundabout
 #. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
@@ -28569,7 +28853,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28579,5 +28863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28587,5 +28871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28595,5 +28879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28603,12 +28887,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3242 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:732 build/trans_style.java:909
-#: build/trans_style.java:917 build/trans_style.java:925
-#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:723 build/trans_style.java:748
+#: build/trans_style.java:757 build/trans_style.java:934
+#: build/trans_style.java:942 build/trans_style.java:950
+#: build/trans_style.java:958 build/trans_style.java:966
 msgid "bicycle"
 msgstr ""
@@ -28635,5 +28920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28649,5 +28934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28657,5 +28942,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28664,13 +28949,21 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
 #. <condition k="foot" v="designated"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="foot" v="official"/>
 #. color bicycle
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28681,11 +28974,12 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3242 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
-#: build/trans_style.java:723 build/trans_style.java:739
-#: build/trans_style.java:740 build/trans_style.java:748
+#: build/trans_style.java:731 build/trans_style.java:739
+#: build/trans_style.java:764 build/trans_style.java:765
+#: build/trans_style.java:773
 msgid "foot"
 msgstr ""
@@ -28704,8 +28998,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3242 build/trans_style.java:1208
+#: build/trans_presets.java:3242 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
@@ -28817,9 +29111,9 @@
 #. 7. scale_min / scale_max
 #. - zoom scale for display
-#. 
+#.
 #. Using both area and line attributes for the same key/value pair does work. For areas
 #. first the best matching area rule is searched and the best matching line rule is
 #. connected with it. They need not have the same key/value pair.
-#. 
+#.
 #. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
 #. If both are given, the color name is introduced in preferences with that value. If only
@@ -28827,5 +29121,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,
@@ -28835,8 +29129,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
@@ -28850,5 +29144,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -28856,5 +29150,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28903,6 +29197,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>
@@ -28982,5 +29276,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28990,16 +29284,16 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--abutters tags -->
-#. 
+#.
 #. <!--accessories tags -->
-#. 
+#.
 #. <!--properties tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4087
+#: build/trans_style.java:633 build/trans_style.java:4120
 msgid "deprecated"
 msgstr ""
@@ -29010,5 +29304,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29017,5 +29311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29024,5 +29318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29038,5 +29332,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29050,5 +29344,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29057,5 +29351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29064,5 +29358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29071,5 +29365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29078,5 +29372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29085,5 +29379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29092,5 +29386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29099,5 +29393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29106,5 +29400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29113,5 +29407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29120,5 +29414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29127,5 +29421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29134,5 +29428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29141,5 +29435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29148,5 +29442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29323,7 +29617,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29337,5 +29631,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29345,7 +29639,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29355,5 +29649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29363,5 +29657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29371,5 +29665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29379,10 +29673,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:649 build/trans_style.java:951
-#: build/trans_style.java:959 build/trans_style.java:967
-#: build/trans_style.java:975 build/trans_style.java:983
+#: build/trans_style.java:649 build/trans_style.java:976
+#: build/trans_style.java:984 build/trans_style.java:992
+#: build/trans_style.java:1000 build/trans_style.java:1008
 msgid "highway_track"
 msgstr ""
@@ -29393,5 +29687,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29400,5 +29694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29408,5 +29702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29415,5 +29709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29422,5 +29716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29429,5 +29723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29436,5 +29730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29443,5 +29737,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29450,5 +29744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29457,5 +29751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29464,5 +29758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29471,8 +29765,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:842
+#: build/trans_style.java:867
 msgid "services"
 msgstr ""
@@ -29483,8 +29777,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:850
+#: build/trans_style.java:875
 msgid "ford"
 msgstr ""
@@ -29495,5 +29789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29502,8 +29796,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:865
+#: build/trans_style.java:890
 msgid "turningcircle"
 msgstr ""
@@ -29514,9 +29808,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:889
+#: build/trans_style.java:914
 msgid "emergency_access_point"
 msgstr ""
@@ -29527,9 +29821,9 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1001 build/trans_style.java:1002
+#: build/trans_style.java:1026 build/trans_style.java:1027
 msgid "riverbank"
 msgstr ""
@@ -29540,8 +29834,8 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:1018
+#: build/trans_style.java:1043
 msgid "stream"
 msgstr ""
@@ -29552,8 +29846,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1041
+#: build/trans_style.java:1066
 msgid "dock"
 msgstr ""
@@ -29564,5 +29858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29571,5 +29865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29578,5 +29872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29586,5 +29880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29593,5 +29887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29600,5 +29894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29607,5 +29901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29615,5 +29909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29624,5 +29918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29632,7 +29926,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29642,5 +29936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29650,5 +29944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29658,5 +29952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29667,5 +29961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29674,5 +29968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29682,5 +29976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29690,5 +29984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29698,5 +29992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29706,5 +30000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29714,5 +30008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29722,5 +30016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29730,5 +30024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29738,5 +30032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29746,18 +30040,18 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_style.java:1064 build/trans_style.java:1093
-#: build/trans_style.java:1109 build/trans_style.java:1110
-#: build/trans_style.java:1118 build/trans_style.java:1603
-#: build/trans_style.java:1610 build/trans_style.java:1619
-#: build/trans_style.java:1627 build/trans_style.java:1659
-#: build/trans_style.java:1667 build/trans_style.java:1675
-#: build/trans_style.java:1683 build/trans_style.java:1690
-#: build/trans_style.java:1699 build/trans_style.java:1707
-#: build/trans_style.java:1715 build/trans_style.java:1723
-#: build/trans_style.java:1731
+#: build/trans_style.java:1089 build/trans_style.java:1118
+#: build/trans_style.java:1134 build/trans_style.java:1135
+#: build/trans_style.java:1143 build/trans_style.java:1628
+#: build/trans_style.java:1635 build/trans_style.java:1644
+#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1692 build/trans_style.java:1700
+#: build/trans_style.java:1708 build/trans_style.java:1715
+#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756
 msgid "manmade"
 msgstr ""
@@ -29767,9 +30061,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_style.java:1101
+#: build/trans_style.java:1126
 msgid "rapids"
 msgstr ""
@@ -29780,7 +30074,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29790,5 +30084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29797,5 +30091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29805,5 +30099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29812,5 +30106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29820,5 +30114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29828,10 +30122,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1128 build/trans_style.java:1143
-#: build/trans_style.java:1158 build/trans_style.java:1166
-#: build/trans_style.java:1174
+#: build/trans_style.java:1153 build/trans_style.java:1168
+#: build/trans_style.java:1183 build/trans_style.java:1191
+#: build/trans_style.java:1199
 msgid "railwaypoint"
 msgstr ""
@@ -29842,5 +30136,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29851,13 +30145,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1191 build/trans_style.java:1200
+#: build/trans_style.java:1216 build/trans_style.java:1225
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr ""
@@ -29868,5 +30162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29876,5 +30170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29887,5 +30181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29893,7 +30187,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1216 build/trans_style.java:1226
-#: build/trans_style.java:1227 build/trans_style.java:1237
-#: build/trans_style.java:1238
+#: build/trans_style.java:1241 build/trans_style.java:1251
+#: build/trans_style.java:1252 build/trans_style.java:1262
+#: build/trans_style.java:1263
 msgid "oldrail"
 msgstr ""
@@ -29904,5 +30198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29911,5 +30205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29918,5 +30212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29925,7 +30219,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29936,9 +30230,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1318 build/trans_style.java:1319
-#: build/trans_style.java:1351
+#: build/trans_style.java:1343 build/trans_style.java:1344
+#: build/trans_style.java:1376
 msgid "aeroway"
 msgstr ""
@@ -29949,8 +30243,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1327
+#: build/trans_style.java:1352
 msgid "terminal"
 msgstr ""
@@ -29961,5 +30255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29969,8 +30263,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1335 build/trans_style.java:1343
+#: build/trans_style.java:1360 build/trans_style.java:1368
 msgid "aeroway_dark"
 msgstr ""
@@ -29981,8 +30275,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1359
+#: build/trans_style.java:1384
 msgid "aeroway_light"
 msgstr ""
@@ -29993,5 +30287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30000,5 +30294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30007,7 +30301,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30017,5 +30311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30025,5 +30319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30033,5 +30327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30041,5 +30335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30049,10 +30343,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
-#: build/trans_style.java:1383 build/trans_style.java:1391
-#: build/trans_style.java:1399 build/trans_style.java:1407
-#: build/trans_style.java:1415 build/trans_style.java:1423
+#: build/trans_style.java:1408 build/trans_style.java:1416
+#: build/trans_style.java:1424 build/trans_style.java:1432
+#: build/trans_style.java:1440 build/trans_style.java:1448
 msgid "aerialway"
 msgstr ""
@@ -30063,11 +30357,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- piste tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1433 build/trans_style.java:1434
+#: build/trans_style.java:1458 build/trans_style.java:1459
 msgid "piste_easy"
 msgstr ""
@@ -30078,9 +30372,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1442 build/trans_style.java:1443
+#: build/trans_style.java:1467 build/trans_style.java:1468
 msgid "piste_intermediate"
 msgstr ""
@@ -30091,9 +30385,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1451 build/trans_style.java:1452
+#: build/trans_style.java:1476 build/trans_style.java:1477
 msgid "piste_advanced"
 msgstr ""
@@ -30104,9 +30398,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1460 build/trans_style.java:1461
+#: build/trans_style.java:1485 build/trans_style.java:1486
 msgid "piste_expert"
 msgstr ""
@@ -30117,9 +30411,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1469 build/trans_style.java:1470
+#: build/trans_style.java:1494 build/trans_style.java:1495
 msgid "piste_freeride"
 msgstr ""
@@ -30130,9 +30424,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1478 build/trans_style.java:1479
+#: build/trans_style.java:1503 build/trans_style.java:1504
 msgid "piste_novice"
 msgstr ""
@@ -30143,7 +30437,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30153,5 +30447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30160,5 +30454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30168,5 +30462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30176,5 +30470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30184,5 +30478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30192,5 +30486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30200,5 +30494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30208,5 +30502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30216,5 +30510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30224,5 +30518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30232,5 +30526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30240,5 +30534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30248,15 +30542,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1490 build/trans_style.java:1504
-#: build/trans_style.java:1512 build/trans_style.java:1521
-#: build/trans_style.java:1529 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1553
-#: build/trans_style.java:1561 build/trans_style.java:1569
-#: build/trans_style.java:1577 build/trans_style.java:1585
-#: build/trans_style.java:1593
+#: build/trans_style.java:1515 build/trans_style.java:1529
+#: build/trans_style.java:1537 build/trans_style.java:1546
+#: build/trans_style.java:1554 build/trans_style.java:1562
+#: build/trans_style.java:1570 build/trans_style.java:1578
+#: build/trans_style.java:1586 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1610
+#: build/trans_style.java:1618
 msgid "power"
 msgstr ""
@@ -30266,9 +30560,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1634 build/trans_style.java:1635
+#: build/trans_style.java:1659 build/trans_style.java:1660
 msgid "pier"
 msgstr ""
@@ -30279,8 +30573,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1643
+#: build/trans_style.java:1668
 msgid "pipeline"
 msgstr ""
@@ -30290,7 +30584,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30300,5 +30594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30308,5 +30602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30316,5 +30610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30324,5 +30618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30332,5 +30626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30340,5 +30634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30348,5 +30642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30356,5 +30650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30364,5 +30658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30372,5 +30666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30380,5 +30674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30388,5 +30682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30396,5 +30690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30404,5 +30698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30412,5 +30706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30420,17 +30714,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1741 build/trans_style.java:1749
-#: build/trans_style.java:1757 build/trans_style.java:1765
-#: build/trans_style.java:1773 build/trans_style.java:1781
-#: build/trans_style.java:1797 build/trans_style.java:1805
-#: build/trans_style.java:1813 build/trans_style.java:1821
-#: build/trans_style.java:1829 build/trans_style.java:1837
-#: build/trans_style.java:1845 build/trans_style.java:1853
-#: build/trans_style.java:1861 build/trans_style.java:1869
-#: build/trans_style.java:1877
+#: build/trans_style.java:1766 build/trans_style.java:1774
+#: build/trans_style.java:1782 build/trans_style.java:1790
+#: build/trans_style.java:1798 build/trans_style.java:1806
+#: build/trans_style.java:1822 build/trans_style.java:1830
+#: build/trans_style.java:1838 build/trans_style.java:1846
+#: build/trans_style.java:1854 build/trans_style.java:1862
+#: build/trans_style.java:1870 build/trans_style.java:1878
+#: build/trans_style.java:1886 build/trans_style.java:1894
+#: build/trans_style.java:1902
 msgid "leisure"
 msgstr ""
@@ -30440,9 +30734,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1789
+#: build/trans_style.java:1814
 msgid "marina"
 msgstr ""
@@ -30452,7 +30746,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30462,5 +30756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30470,5 +30764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30478,5 +30772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30486,5 +30780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30494,5 +30788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30502,5 +30796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30510,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30518,5 +30812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30526,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30534,14 +30828,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1887 build/trans_style.java:1895
-#: build/trans_style.java:1903 build/trans_style.java:1911
-#: build/trans_style.java:1919 build/trans_style.java:1927
-#: build/trans_style.java:1935 build/trans_style.java:1943
-#: build/trans_style.java:1951 build/trans_style.java:1959
-#: build/trans_style.java:1967
+#: build/trans_style.java:1912 build/trans_style.java:1920
+#: build/trans_style.java:1928 build/trans_style.java:1936
+#: build/trans_style.java:1944 build/trans_style.java:1952
+#: build/trans_style.java:1960 build/trans_style.java:1968
+#: build/trans_style.java:1976 build/trans_style.java:1984
+#: build/trans_style.java:1992
 msgid "amenity"
 msgstr ""
@@ -30551,5 +30845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30559,5 +30853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30567,5 +30861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30575,5 +30869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30583,5 +30877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30591,5 +30885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30599,5 +30893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30607,5 +30901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30615,5 +30909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30623,5 +30917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30631,5 +30925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30639,14 +30933,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1975 build/trans_style.java:1983
-#: build/trans_style.java:1991 build/trans_style.java:1999
-#: build/trans_style.java:2007 build/trans_style.java:2015
-#: build/trans_style.java:2023 build/trans_style.java:2031
-#: build/trans_style.java:2039 build/trans_style.java:2046
-#: build/trans_style.java:2055 build/trans_style.java:2063
+#: build/trans_style.java:2000 build/trans_style.java:2008
+#: build/trans_style.java:2016 build/trans_style.java:2024
+#: build/trans_style.java:2032 build/trans_style.java:2040
+#: build/trans_style.java:2048 build/trans_style.java:2056
+#: build/trans_style.java:2064 build/trans_style.java:2071
+#: build/trans_style.java:2080 build/trans_style.java:2088
 msgid "amenity_traffic"
 msgstr ""
@@ -30656,5 +30950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30663,5 +30957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30671,5 +30965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30678,5 +30972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30686,5 +30980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30694,5 +30988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30702,5 +30996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30709,5 +31003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30717,5 +31011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30725,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30733,5 +31027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30741,5 +31035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30748,5 +31042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30755,5 +31049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30762,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30769,5 +31063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30776,5 +31070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30783,5 +31077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30790,5 +31084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30797,5 +31091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30804,5 +31098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30811,5 +31105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30818,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30825,5 +31119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30832,5 +31126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30840,5 +31134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30848,5 +31142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30856,5 +31150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30864,5 +31158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30872,5 +31166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30880,5 +31174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30888,5 +31182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30896,5 +31190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30904,5 +31198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30913,5 +31207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30921,5 +31215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30929,5 +31223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30937,5 +31231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30945,5 +31239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30953,5 +31247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30961,5 +31255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30969,5 +31263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30977,5 +31271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30985,5 +31279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30993,5 +31287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31001,5 +31295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31009,5 +31303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31017,5 +31311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31025,5 +31319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31033,5 +31327,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
+#. <rule>
+#. <condition k="amenity" v="fire_hydrant"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/fire_hydrant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31041,5 +31343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31049,5 +31351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31057,5 +31359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31065,5 +31367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31072,27 +31374,28 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2078 build/trans_style.java:2093
-#: build/trans_style.java:2101 build/trans_style.java:2109
-#: build/trans_style.java:2124 build/trans_style.java:2132
-#: build/trans_style.java:2140 build/trans_style.java:2148
-#: build/trans_style.java:2263 build/trans_style.java:2271
-#: build/trans_style.java:2278 build/trans_style.java:2287
-#: build/trans_style.java:2295 build/trans_style.java:2303
-#: build/trans_style.java:2311 build/trans_style.java:2319
-#: build/trans_style.java:2327 build/trans_style.java:2335
-#: build/trans_style.java:2398 build/trans_style.java:2406
-#: build/trans_style.java:2414 build/trans_style.java:2423
-#: build/trans_style.java:2431 build/trans_style.java:2438
-#: build/trans_style.java:2446 build/trans_style.java:2454
-#: build/trans_style.java:2462 build/trans_style.java:2470
-#: build/trans_style.java:2478 build/trans_style.java:2486
-#: build/trans_style.java:2494 build/trans_style.java:2502
-#: build/trans_style.java:2510 build/trans_style.java:2518
-#: build/trans_style.java:2526 build/trans_style.java:2534
-#: build/trans_style.java:2543 build/trans_style.java:2558
+#: build/trans_style.java:2103 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2149 build/trans_style.java:2157
+#: build/trans_style.java:2165 build/trans_style.java:2173
+#: build/trans_style.java:2288 build/trans_style.java:2296
+#: build/trans_style.java:2303 build/trans_style.java:2312
+#: build/trans_style.java:2320 build/trans_style.java:2328
+#: build/trans_style.java:2336 build/trans_style.java:2344
+#: build/trans_style.java:2352 build/trans_style.java:2360
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2456 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2576
+#: build/trans_style.java:2591
 msgid "amenity_light"
 msgstr ""
@@ -31102,5 +31405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31110,5 +31413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31118,12 +31421,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--natural tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2156 build/trans_style.java:2164
-#: build/trans_style.java:3403
+#: build/trans_style.java:2181 build/trans_style.java:2189
+#: build/trans_style.java:3436
 msgid "light_water"
 msgstr ""
@@ -31133,5 +31436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31141,5 +31444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31149,5 +31452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31157,5 +31460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31165,5 +31468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31173,5 +31476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31181,11 +31484,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2342 build/trans_style.java:2350
-#: build/trans_style.java:2358 build/trans_style.java:2367
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390
+#: build/trans_style.java:2367 build/trans_style.java:2375
+#: build/trans_style.java:2383 build/trans_style.java:2392
+#: build/trans_style.java:2399 build/trans_style.java:2407
+#: build/trans_style.java:2415
 msgid "health"
 msgstr ""
@@ -31195,7 +31498,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31205,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31213,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31221,5 +31524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31229,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31237,5 +31540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31245,5 +31548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31253,5 +31556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31261,5 +31564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31269,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31277,5 +31580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31285,5 +31588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31293,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31301,5 +31604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31309,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31317,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31325,5 +31628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31333,5 +31636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31341,5 +31644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31349,5 +31652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31357,5 +31660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31365,5 +31668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31373,5 +31676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31381,5 +31684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31389,5 +31692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31397,5 +31700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31405,5 +31708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31413,5 +31716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31421,5 +31724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31429,5 +31732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31437,5 +31740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31445,5 +31748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31453,5 +31756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31461,5 +31764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31469,5 +31772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31477,5 +31780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31485,5 +31788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31493,5 +31796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31501,5 +31804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31509,5 +31812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31517,5 +31820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31525,5 +31828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31533,31 +31836,31 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2568 build/trans_style.java:2576
-#: build/trans_style.java:2584 build/trans_style.java:2592
-#: build/trans_style.java:2600 build/trans_style.java:2608
-#: build/trans_style.java:2616 build/trans_style.java:2624
-#: build/trans_style.java:2632 build/trans_style.java:2640
-#: build/trans_style.java:2648 build/trans_style.java:2656
-#: build/trans_style.java:2664 build/trans_style.java:2672
-#: build/trans_style.java:2680 build/trans_style.java:2688
-#: build/trans_style.java:2696 build/trans_style.java:2704
-#: build/trans_style.java:2712 build/trans_style.java:2720
-#: build/trans_style.java:2728 build/trans_style.java:2736
-#: build/trans_style.java:2744 build/trans_style.java:2752
-#: build/trans_style.java:2760 build/trans_style.java:2768
-#: build/trans_style.java:2776 build/trans_style.java:2784
-#: build/trans_style.java:2792 build/trans_style.java:2800
-#: build/trans_style.java:2808 build/trans_style.java:2816
-#: build/trans_style.java:2824 build/trans_style.java:2832
-#: build/trans_style.java:2840 build/trans_style.java:2848
-#: build/trans_style.java:2856 build/trans_style.java:2864
-#: build/trans_style.java:2872 build/trans_style.java:2880
-#: build/trans_style.java:2888 build/trans_style.java:2896
-#: build/trans_style.java:2905
+#: build/trans_style.java:2601 build/trans_style.java:2609
+#: build/trans_style.java:2617 build/trans_style.java:2625
+#: build/trans_style.java:2633 build/trans_style.java:2641
+#: build/trans_style.java:2649 build/trans_style.java:2657
+#: build/trans_style.java:2665 build/trans_style.java:2673
+#: build/trans_style.java:2681 build/trans_style.java:2689
+#: build/trans_style.java:2697 build/trans_style.java:2705
+#: build/trans_style.java:2713 build/trans_style.java:2721
+#: build/trans_style.java:2729 build/trans_style.java:2737
+#: build/trans_style.java:2745 build/trans_style.java:2753
+#: build/trans_style.java:2761 build/trans_style.java:2769
+#: build/trans_style.java:2777 build/trans_style.java:2785
+#: build/trans_style.java:2793 build/trans_style.java:2801
+#: build/trans_style.java:2809 build/trans_style.java:2817
+#: build/trans_style.java:2825 build/trans_style.java:2833
+#: build/trans_style.java:2841 build/trans_style.java:2849
+#: build/trans_style.java:2857 build/trans_style.java:2865
+#: build/trans_style.java:2873 build/trans_style.java:2881
+#: build/trans_style.java:2889 build/trans_style.java:2897
+#: build/trans_style.java:2905 build/trans_style.java:2913
+#: build/trans_style.java:2921 build/trans_style.java:2929
+#: build/trans_style.java:2938
 msgid "shop"
 msgstr ""
@@ -31567,7 +31870,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31577,5 +31880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31585,5 +31888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31593,5 +31896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31601,5 +31904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31609,5 +31912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31617,5 +31920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31625,12 +31928,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2915 build/trans_style.java:2923
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
+#: build/trans_style.java:2996 build/trans_style.java:3004
 msgid "hotel"
 msgstr ""
@@ -31640,5 +31943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31648,5 +31951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31656,5 +31959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31664,5 +31967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31672,5 +31975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31680,5 +31983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31689,5 +31992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31697,5 +32000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31705,5 +32008,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31713,5 +32016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31720,5 +32023,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31727,13 +32030,13 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2979 build/trans_style.java:2987
-#: build/trans_style.java:2995 build/trans_style.java:3003
-#: build/trans_style.java:3011 build/trans_style.java:3019
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3066
+#: build/trans_style.java:3012 build/trans_style.java:3020
+#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3053 build/trans_style.java:3061
+#: build/trans_style.java:3077 build/trans_style.java:3099
 msgid "tourism"
 msgstr ""
@@ -31743,7 +32046,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31753,5 +32056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31761,5 +32064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31769,5 +32072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31777,5 +32080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31785,5 +32088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31793,5 +32096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31801,5 +32104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31809,5 +32112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31817,13 +32120,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3092 build/trans_style.java:3100
-#: build/trans_style.java:3108 build/trans_style.java:3116
-#: build/trans_style.java:3124 build/trans_style.java:3132
-#: build/trans_style.java:3140 build/trans_style.java:3148
+#: build/trans_style.java:3109 build/trans_style.java:3117
+#: build/trans_style.java:3125 build/trans_style.java:3133
+#: build/trans_style.java:3141 build/trans_style.java:3149
+#: build/trans_style.java:3157 build/trans_style.java:3165
+#: build/trans_style.java:3173 build/trans_style.java:3181
 msgid "historic"
 msgstr ""
@@ -31833,8 +32136,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3196
+#: build/trans_style.java:3229
 msgid "quarry"
 msgstr ""
@@ -31845,8 +32148,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3204
+#: build/trans_style.java:3237
 msgid "landfill"
 msgstr ""
@@ -31857,5 +32160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31865,8 +32168,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3245 build/trans_style.java:3253
 msgid "basin"
 msgstr ""
@@ -31877,8 +32180,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3260
+#: build/trans_style.java:3293
 msgid "farmyard"
 msgstr ""
@@ -31889,6 +32192,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31898,8 +32201,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3269 build/trans_style.java:3277
+#: build/trans_style.java:3302 build/trans_style.java:3310
 msgid "retail"
 msgstr ""
@@ -31910,8 +32213,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3285
+#: build/trans_style.java:3318
 msgid "industrial"
 msgstr ""
@@ -31922,8 +32225,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3326
 msgid "brownfield"
 msgstr ""
@@ -31934,8 +32237,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3334
 msgid "greenfield"
 msgstr ""
@@ -31946,8 +32249,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3342
 msgid "railland"
 msgstr ""
@@ -31958,5 +32261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31966,7 +32269,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31976,5 +32279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31984,5 +32287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31992,5 +32295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32000,11 +32303,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3361
-#: build/trans_style.java:3369 build/trans_style.java:3377
-#: build/trans_style.java:3385 build/trans_style.java:3393
+#: build/trans_style.java:3359 build/trans_style.java:3394
+#: build/trans_style.java:3402 build/trans_style.java:3410
+#: build/trans_style.java:3418 build/trans_style.java:3426
 msgid "military"
 msgstr ""
@@ -32015,8 +32318,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3367
 msgid "cemetery"
 msgstr ""
@@ -32026,8 +32329,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3410
+#: build/trans_style.java:3443
 msgid "peak"
 msgstr ""
@@ -32038,9 +32341,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3419
+#: build/trans_style.java:3452
 msgid "glacier"
 msgstr ""
@@ -32050,9 +32353,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3427
+#: build/trans_style.java:3460
 msgid "volcano"
 msgstr ""
@@ -32062,5 +32365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32071,5 +32374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32079,5 +32382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32087,5 +32390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32095,5 +32398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32103,12 +32406,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3435 build/trans_style.java:3436
-#: build/trans_style.java:3444 build/trans_style.java:3460
-#: build/trans_style.java:3524 build/trans_style.java:3532
-#: build/trans_style.java:3540
+#: build/trans_style.java:3468 build/trans_style.java:3469
+#: build/trans_style.java:3477 build/trans_style.java:3493
+#: build/trans_style.java:3557 build/trans_style.java:3565
+#: build/trans_style.java:3573
 msgid "natural"
 msgstr ""
@@ -32118,9 +32421,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3485
 msgid "scrub"
 msgstr ""
@@ -32130,9 +32433,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468
+#: build/trans_style.java:3501
 msgid "heath"
 msgstr ""
@@ -32142,9 +32445,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3476
+#: build/trans_style.java:3509
 msgid "woodarea"
 msgstr ""
@@ -32154,9 +32457,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3508
+#: build/trans_style.java:3541
 msgid "mud"
 msgstr ""
@@ -32166,9 +32469,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3516
+#: build/trans_style.java:3549
 msgid "beach"
 msgstr ""
@@ -32179,5 +32482,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?
@@ -32203,5 +32506,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32212,11 +32515,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32226,5 +32529,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32234,5 +32537,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32242,5 +32545,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32250,5 +32553,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32258,5 +32561,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32266,5 +32569,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32274,5 +32577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32282,5 +32585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32290,5 +32593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32298,5 +32601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32306,5 +32609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32314,15 +32617,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4135 build/trans_style.java:4143
-#: build/trans_style.java:4151 build/trans_style.java:4159
-#: build/trans_style.java:4167 build/trans_style.java:4175
-#: build/trans_style.java:4183 build/trans_style.java:4191
-#: build/trans_style.java:4199 build/trans_style.java:4207
-#: build/trans_style.java:4215 build/trans_style.java:4223
-#: build/trans_style.java:4231
+#: build/trans_style.java:4168 build/trans_style.java:4176
+#: build/trans_style.java:4184 build/trans_style.java:4192
+#: build/trans_style.java:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 build/trans_style.java:4240
+#: build/trans_style.java:4248 build/trans_style.java:4256
+#: build/trans_style.java:4264
 msgid "place"
 msgstr ""
@@ -32332,9 +32635,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4239
+#: build/trans_style.java:4272
 msgid "tiger_data"
 msgstr ""
@@ -32425,5 +32728,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32431,28 +32734,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
@@ -32567,5 +32870,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32578,5 +32881,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>
@@ -32601,6 +32904,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32609,6 +32912,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32623,6 +32926,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
@@ -32636,6 +32939,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
@@ -32655,6 +32958,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32678,6 +32981,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
@@ -32702,9 +33005,7 @@
 #~ msgstr "Najprej izberite zaznamek."
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Točka {0} x {1} nima časovne oznake"
@@ -32713,13 +33014,10 @@
 #~ msgstr "Uskladi uro"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "V datoteki \"{0}\" manjka EXIF čas."
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
@@ -32734,5 +33032,4 @@
 #~ msgstr "moja različica:"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32765,5 +33062,4 @@
 #~ msgstr "E-pošta"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontaktiraj {0}..."
@@ -32775,13 +33071,10 @@
 #~ msgstr "Ni moč najti slik z berljivo časovno oznako."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "Začetek GPS sledi: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "trenutna razlika: {0}s"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Konec GPS sledi: {0}"
@@ -32794,5 +33087,4 @@
 #~ msgstr[3] "slike"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} znotraj sledi."
@@ -32824,5 +33116,4 @@
 #~ msgstr "Sprejmi področje"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32834,9 +33125,7 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Vstavka {0} ni bilo mogoče najti."
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč"
@@ -32879,7 +33168,4 @@
 #~ msgstr "Pomoč / O programu"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Ali ste prepričani?"
-
 #~ msgid "Cycleway"
 #~ msgstr "Kolesarska steza"
@@ -32912,17 +33198,16 @@
 #~ msgstr "Neveljaven id točke"
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Ni mogoče brati z naslova: \"{0}\""
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Napaka pri razločevanju na naslovu: \"{0}\""
 
-#, 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 ""
-#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno sprejeti."
+#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno "
+#~ "sprejeti."
 
 #~ msgid "Synchronize Time with GPS Unit"
@@ -32932,9 +33217,7 @@
 #~ msgstr "Pošiljanje ..."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Napaka: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Opozorilo: {0}"
@@ -32947,6 +33230,6 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih ste "
-#~ "dobili JOSM."
+#~ "Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih "
+#~ "ste dobili JOSM."
 
 #~ msgid ""
@@ -32958,15 +33241,15 @@
 
 #~ 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 ""
 #~ "Preden prijavite napako poskusite posodobiti JOSM na najnovejšo različico."
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
-#~ "overwrite the existing ones."
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
 #~ msgstr ""
-#~ "Aktivacija posodobljenih vstavkov ni uspela. Preverite, če ima JOSM pravico "
-#~ "prepisati obstoječe datoteke."
+#~ "Aktivacija posodobljenih vstavkov ni uspela. Preverite, če ima JOSM "
+#~ "pravico prepisati obstoječe datoteke."
 
 #~ msgid "Plugin already exists"
@@ -32982,9 +33265,7 @@
 #~ msgstr "Prenos prekinjen zaradi napake (5 sekund premora):"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Vstavek zahteva posodobitev programa JOSM: {0}."
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Prosimo, prijavite težavo na {0}"
@@ -33014,5 +33295,4 @@
 #~ msgstr "Oprostite, to ne deluje z anonimnimi uporabniki"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
@@ -33030,5 +33310,4 @@
 #~ msgstr "Dodaj kot člane vse trenutno izbrane predmete"
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Neznana vloga ''{0}''."
@@ -33043,5 +33322,4 @@
 #~ msgstr "Vse poti so bile prazne"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Napaka pri nalaganju strani {0}"
@@ -33086,5 +33364,4 @@
 #~ msgstr "parameter '{0}' ne sme biti ničen"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parameter ''{0}'' ne sme biti ničen"
